vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Counter-Strike: Cleaned up the weapon-table

Browse source
This commit is contained in:
Marco Cawthorne 2020-04-28 06:09:57 +02:00
parent 12328e2d08
commit 70ddc6a150
24 changed files with 462 additions and 462 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/shared/cstrike/w_awp.c
View file

@ -298,26 +298,26 @@ w_awp_hudpic(int selected, vector pos, float a)
weapon_t w_awp =
{
"awp",
ITEM_AWP,
0,
12,
TRUE,
w_awp_draw,
__NULL__,
w_awp_primary,
w_awp_secondary,
w_awp_reload,
w_awp_release,
w_awp_hud,
w_awp_precache,
w_awp_pickup,
w_awp_updateammo,
w_awp_wmodel,
w_awp_pmodel,
w_awp_deathmsg,
w_awp_aimanim,
w_awp_hudpic
.name = "awp",
.id = ITEM_AWP,
.slot = 0,
.slot_pos = 12,
.allow_drop = TRUE,
.draw = w_awp_draw,
.holster = __NULL__,
.primary = w_awp_primary,
.secondary = w_awp_secondary,
.reload = w_awp_reload,
.release = w_awp_release,
.crosshair = w_awp_hud,
.precache = w_awp_precache,
.pickup = w_awp_pickup,
.updateammo = w_awp_updateammo,
.wmodel = w_awp_wmodel,
.pmodel = w_awp_pmodel,
.deathmsg = w_awp_deathmsg,
.aimanim = w_awp_aimanim,
.hudpic = w_awp_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_c4bomb.c
View file

@ -306,26 +306,26 @@ w_c4bomb_hudpic(int selected, vector pos, float a)
weapon_t w_c4bomb =
{
"c4",
ITEM_C4BOMB,
4,
0,
TRUE,
w_c4bomb_draw,
__NULL__,
w_c4bomb_primary,
__NULL__,
__NULL__,
w_c4bomb_release,
w_c4bomb_hud,
w_c4bomb_precache,
__NULL__,
w_c4bomb_updateammo,
w_c4bomb_wmodel,
w_c4bomb_pmodel,
w_c4bomb_deathmsg,
w_c4bomb_aimanim,
w_c4bomb_hudpic
.name = "c4",
.id = ITEM_C4BOMB,
.slot = 4,
.slot_pos = 0,
.allow_drop = TRUE,
.draw = w_c4bomb_draw,
.holster = __NULL__,
.primary = w_c4bomb_primary,
.secondary = __NULL__,
.reload = __NULL__,
.release = w_c4bomb_release,
.crosshair = w_c4bomb_hud,
.precache = w_c4bomb_precache,
.pickup = __NULL__,
.updateammo = w_c4bomb_updateammo,
.wmodel = w_c4bomb_wmodel,
.pmodel = w_c4bomb_pmodel,
.deathmsg = w_c4bomb_deathmsg,
.aimanim = w_c4bomb_aimanim,
.hudpic = w_c4bomb_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_deagle.c
View file

@ -252,26 +252,26 @@ w_deagle_hudpic(int selected, vector pos, float a)
weapon_t w_deagle =
{
"deagle",
ITEM_DEAGLE,
1,
2,
TRUE,
w_deagle_draw,
__NULL__,
w_deagle_primary,
__NULL__,
w_deagle_reload,
w_cstrike_weaponrelease,
w_deagle_hud,
w_deagle_precache,
w_deagle_pickup,
w_deagle_updateammo,
w_deagle_wmodel,
w_deagle_pmodel,
w_deagle_deathmsg,
w_deagle_aimanim,
w_deagle_hudpic
.name = "deagle",
.id = ITEM_DEAGLE,
.slot = 1,
.slot_pos = 2,
.allow_drop = TRUE,
.draw = w_deagle_draw,
.holster = __NULL__,
.primary = w_deagle_primary,
.secondary = __NULL__,
.reload = w_deagle_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_deagle_hud,
.precache = w_deagle_precache,
.pickup = w_deagle_pickup,
.updateammo = w_deagle_updateammo,
.wmodel = w_deagle_wmodel,
.pmodel = w_deagle_pmodel,
.deathmsg = w_deagle_deathmsg,
.aimanim = w_deagle_aimanim,
.hudpic = w_deagle_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_elites.c
View file

@ -303,26 +303,26 @@ w_elites_hudpic(int selected, vector pos, float a)
weapon_t w_elites =
{
"elites",
ITEM_ELITES,
1,
4,
TRUE,
w_elites_draw,
__NULL__,
w_elites_primary,
__NULL__,
w_elites_reload,
w_cstrike_weaponrelease,
w_elites_hud,
w_elites_precache,
w_elites_pickup,
w_elites_updateammo,
w_elites_wmodel,
w_elites_pmodel,
w_elites_deathmsg,
w_elites_aimanim,
w_elites_hudpic
.name = "elites",
.id = ITEM_ELITES,
.slot = 1,
.slot_pos = 4,
.allow_drop = TRUE,
.draw = w_elites_draw,
.holster = __NULL__,
.primary = w_elites_primary,
.secondary = __NULL__,
.reload = w_elites_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_elites_hud,
.precache = w_elites_precache,
.pickup = w_elites_pickup,
.updateammo = w_elites_updateammo,
.wmodel = w_elites_wmodel,
.pmodel = w_elites_pmodel,
.deathmsg = w_elites_deathmsg,
.aimanim = w_elites_aimanim,
.hudpic = w_elites_hudpic
};
#ifdef SERVER

42
src/shared/cstrike/w_fiveseven.c
View file

@ -205,7 +205,7 @@ w_fiveseven_reload(void)
float
w_fiveseven_aimanim(void)
{
return w_deagle_aimanim();
return w_fiveseven_aimanim();
}
void
@ -252,26 +252,26 @@ w_fiveseven_hudpic(int selected, vector pos, float a)
weapon_t w_fiveseven =
{
"fiveseven",
ITEM_FIVESEVEN,
1,
5,
TRUE,
w_fiveseven_draw,
__NULL__,
w_fiveseven_primary,
__NULL__,
w_fiveseven_reload,
w_cstrike_weaponrelease,
w_fiveseven_hud,
w_fiveseven_precache,
w_fiveseven_pickup,
w_fiveseven_updateammo,
w_fiveseven_wmodel,
w_fiveseven_pmodel,
w_fiveseven_deathmsg,
w_fiveseven_aimanim,
w_fiveseven_hudpic
.name = "fiveseven",
.id = ITEM_FIVESEVEN,
.slot = 1,
.slot_pos = 5,
.allow_drop = TRUE,
.draw = w_fiveseven_draw,
.holster = __NULL__,
.primary = w_fiveseven_primary,
.secondary = __NULL__,
.reload = w_fiveseven_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_fiveseven_hud,
.precache = w_fiveseven_precache,
.pickup = w_fiveseven_pickup,
.updateammo = w_fiveseven_updateammo,
.wmodel = w_fiveseven_wmodel,
.pmodel = w_fiveseven_pmodel,
.deathmsg = w_fiveseven_deathmsg,
.aimanim = w_fiveseven_aimanim,
.hudpic = w_fiveseven_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_flashbang.c
View file

@ -263,26 +263,26 @@ w_flashbang_hudpic(int selected, vector pos, float a)
weapon_t w_flashbang =
{
"flashbang",
ITEM_FLASHBANG,
3,
1,
FALSE,
w_flashbang_draw,
__NULL__,
w_flashbang_primary,
w_flashbang_release,
w_flashbang_release,
w_flashbang_release,
w_flashbang_hud,
w_flashbang_precache,
w_flashbang_pickup,
w_flashbang_updateammo,
w_flashbang_wmodel,
w_flashbang_pmodel,
w_flashbang_deathmsg,
w_flashbang_aimanim,
w_flashbang_hudpic
.name = "flashbang",
.id = ITEM_FLASHBANG,
.slot = 3,
.slot_pos = 1,
.allow_drop = FALSE,
.draw = w_flashbang_draw,
.holster = __NULL__,
.primary = w_flashbang_primary,
.secondary = __NULL__,
.reload = __NULL__,
.release = w_flashbang_release,
.crosshair = w_flashbang_hud,
.precache = w_flashbang_precache,
.pickup = w_flashbang_pickup,
.updateammo = w_flashbang_updateammo,
.wmodel = w_flashbang_wmodel,
.pmodel = w_flashbang_pmodel,
.deathmsg = w_flashbang_deathmsg,
.aimanim = w_flashbang_aimanim,
.hudpic = w_flashbang_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_g3sg1.c
View file

@ -263,26 +263,26 @@ w_g3sg1_hudpic(int selected, vector pos, float a)
weapon_t w_g3sg1 =
{
"g3sg1",
ITEM_G3SG1,
0,
13,
TRUE,
w_g3sg1_draw,
__NULL__,
w_g3sg1_primary,
w_g3sg1_secondary,
w_g3sg1_reload,
w_cstrike_weaponrelease,
w_g3sg1_hud,
w_g3sg1_precache,
w_g3sg1_pickup,
w_g3sg1_updateammo,
w_g3sg1_wmodel,
w_g3sg1_pmodel,
w_g3sg1_deathmsg,
w_g3sg1_aimanim,
w_g3sg1_hudpic
.name = "g3sg1",
.id = ITEM_G3SG1,
.slot = 0,
.slot_pos = 13,
.allow_drop = TRUE,
.draw = w_g3sg1_draw,
.holster = __NULL__,
.primary = w_g3sg1_primary,
.secondary = w_g3sg1_secondary,
.reload = w_g3sg1_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_g3sg1_hud,
.precache = w_g3sg1_precache,
.pickup = w_g3sg1_pickup,
.updateammo = w_g3sg1_updateammo,
.wmodel = w_g3sg1_wmodel,
.pmodel = w_g3sg1_pmodel,
.deathmsg = w_g3sg1_deathmsg,
.aimanim = w_g3sg1_aimanim,
.hudpic = w_g3sg1_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_glock18.c
View file

@ -311,26 +311,26 @@ w_glock18_hudpic(int selected, vector pos, float a)
weapon_t w_glock18 =
{
"glock18",
ITEM_GLOCK18,
1,
1,
TRUE,
w_glock18_draw,
__NULL__,
w_glock18_primary,
w_glock18_secondary,
w_glock18_reload,
w_cstrike_weaponrelease,
w_glock18_hud,
w_glock18_precache,
w_glock18_pickup,
w_glock18_updateammo,
w_glock18_wmodel,
w_glock18_pmodel,
w_glock18_deathmsg,
w_glock18_aimanim,
w_glock18_hudpic
.name = "glock18",
.id = ITEM_GLOCK18,
.slot = 1,
.slot_pos = 1,
.allow_drop = TRUE,
.draw = w_glock18_draw,
.holster = __NULL__,
.primary = w_glock18_primary,
.secondary = w_glock18_secondary,
.reload = w_glock18_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_glock18_hud,
.precache = w_glock18_precache,
.pickup = w_glock18_pickup,
.updateammo = w_glock18_updateammo,
.wmodel = w_glock18_wmodel,
.pmodel = w_glock18_pmodel,
.deathmsg = w_glock18_deathmsg,
.aimanim = w_glock18_aimanim,
.hudpic = w_glock18_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_hegrenade.c
View file

@ -265,26 +265,26 @@ w_hegrenade_hudpic(int selected, vector pos, float a)
weapon_t w_hegrenade =
{
"hegrenade",
ITEM_HEGRENADE,
3,
0,
FALSE,
w_hegrenade_draw,
__NULL__,
w_hegrenade_primary,
w_hegrenade_release,
w_hegrenade_release,
w_hegrenade_release,
w_hegrenade_hud,
w_hegrenade_precache,
w_hegrenade_pickup,
w_hegrenade_updateammo,
w_hegrenade_wmodel,
w_hegrenade_pmodel,
w_hegrenade_deathmsg,
w_hegrenade_aimanim,
w_hegrenade_hudpic
.name = "hegrenade",
.id = ITEM_HEGRENADE,
.slot = 3,
.slot_pos = 0,
.allow_drop = FALSE,
.draw = w_hegrenade_draw,
.holster = __NULL__,
.primary = w_hegrenade_primary,
.secondary = __NULL__,
.reload = __NULL__,
.release = w_hegrenade_release,
.crosshair = w_hegrenade_hud,
.precache = w_hegrenade_precache,
.pickup = w_hegrenade_pickup,
.updateammo = w_hegrenade_updateammo,
.wmodel = w_hegrenade_wmodel,
.pmodel = w_hegrenade_pmodel,
.deathmsg = w_hegrenade_deathmsg,
.aimanim = w_hegrenade_aimanim,
.hudpic = w_hegrenade_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_knife.c
View file

@ -212,26 +212,26 @@ w_knife_hudpic(int selected, vector pos, float a)
weapon_t w_knife =
{
"knife",
ITEM_KNIFE,
2,
0,
FALSE,
w_knife_draw,
__NULL__,
w_knife_primary,
w_knife_secondary,
__NULL__,
__NULL__,
__NULL__,
w_knife_precache,
__NULL__,
w_knife_updateammo,
w_knife_wmodel,
w_knife_pmodel,
w_knife_deathmsg,
w_knife_aimanim,
w_knife_hudpic
.name = "knife",
.id = ITEM_KNIFE,
.slot = 2,
.slot_pos = 0,
.allow_drop = FALSE,
.draw = w_knife_draw,
.holster = __NULL__,
.primary = w_knife_primary,
.secondary = w_knife_secondary,
.reload = __NULL__,
.release = __NULL__,
.crosshair = __NULL__,
.precache = w_knife_precache,
.pickup = __NULL__,
.updateammo = w_knife_updateammo,
.wmodel = w_knife_wmodel,
.pmodel = w_knife_pmodel,
.deathmsg = w_knife_deathmsg,
.aimanim = w_knife_aimanim,
.hudpic = w_knife_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_m3.c
View file

@ -287,26 +287,26 @@ w_m3_hudpic(int selected, vector pos, float a)
weapon_t w_m3 =
{
"m3",
ITEM_M3,
0,
0,
TRUE,
w_m3_draw,
__NULL__,
w_m3_primary,
__NULL__,
w_m3_reload,
w_m3_release,
w_m3_hud,
w_m3_precache,
w_m3_pickup,
w_m3_updateammo,
w_m3_wmodel,
w_m3_pmodel,
w_m3_deathmsg,
w_m3_aimanim,
w_m3_hudpic
.name = "m3",
.id = ITEM_M3,
.slot = 0,
.slot_pos = 0,
.allow_drop = TRUE,
.draw = w_m3_draw,
.holster = __NULL__,
.primary = w_m3_primary,
.secondary = __NULL__,
.reload = w_m3_reload,
.release = w_m3_release,
.crosshair = w_m3_hud,
.precache = w_m3_precache,
.pickup = w_m3_pickup,
.updateammo = w_m3_updateammo,
.wmodel = w_m3_wmodel,
.pmodel = w_m3_pmodel,
.deathmsg = w_m3_deathmsg,
.aimanim = w_m3_aimanim,
.hudpic = w_m3_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_mac10.c
View file

@ -246,26 +246,26 @@ w_mac10_hudpic(int selected, vector pos, float a)
weapon_t w_mac10 =
{
"mac10",
ITEM_MAC10,
0,
5,
TRUE,
w_mac10_draw,
__NULL__,
w_mac10_primary,
__NULL__,
w_mac10_reload,
w_cstrike_weaponrelease,
w_mac10_hud,
w_mac10_precache,
w_mac10_pickup,
w_mac10_updateammo,
w_mac10_wmodel,
w_mac10_pmodel,
w_mac10_deathmsg,
w_mac10_aimanim,
w_mac10_hudpic
.name = "mac10",
.id = ITEM_MAC10,
.slot = 0,
.slot_pos = 5,
.allow_drop = TRUE,
.draw = w_mac10_draw,
.holster = __NULL__,
.primary = w_mac10_primary,
.secondary = __NULL__,
.reload = w_mac10_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_mac10_hud,
.precache = w_mac10_precache,
.pickup = w_mac10_pickup,
.updateammo = w_mac10_updateammo,
.wmodel = w_mac10_wmodel,
.pmodel = w_mac10_pmodel,
.deathmsg = w_mac10_deathmsg,
.aimanim = w_mac10_aimanim,
.hudpic = w_mac10_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_mp5.c
View file

@ -251,26 +251,26 @@ w_mp5_hudpic(int selected, vector pos, float a)
weapon_t w_mp5 =
{
"mp5navy",
ITEM_MP5,
0,
2,
TRUE,
w_mp5_draw,
__NULL__,
w_mp5_primary,
__NULL__,
w_mp5_reload,
w_cstrike_weaponrelease,
w_mp5_hud,
w_mp5_precache,
w_mp5_pickup,
w_mp5_updateammo,
w_mp5_wmodel,
w_mp5_pmodel,
w_mp5_deathmsg,
w_mp5_aimanim,
w_mp5_hudpic
.name = "mp5navy",
.id = ITEM_MP5,
.slot = 0,
.slot_pos = 2,
.allow_drop = TRUE,
.draw = w_mp5_draw,
.holster = __NULL__,
.primary = w_mp5_primary,
.secondary = __NULL__,
.reload = w_mp5_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_mp5_hud,
.precache = w_mp5_precache,
.pickup = w_mp5_pickup,
.updateammo = w_mp5_updateammo,
.wmodel = w_mp5_wmodel,
.pmodel = w_mp5_pmodel,
.deathmsg = w_mp5_deathmsg,
.aimanim = w_mp5_aimanim,
.hudpic = w_mp5_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_p228.c
View file

@ -259,26 +259,26 @@ w_p228_hudpic(int selected, vector pos, float a)
weapon_t w_p228 =
{
"p228",
ITEM_P228,
1,
3,
TRUE,
w_p228_draw,
__NULL__,
w_p228_primary,
__NULL__,
w_p228_reload,
w_cstrike_weaponrelease,
w_p228_hud,
w_p228_precache,
w_p228_pickup,
w_p228_updateammo,
w_p228_wmodel,
w_p228_pmodel,
w_p228_deathmsg,
w_p228_aimanim,
w_p228_hudpic
.name = "p228",
.id = ITEM_P228,
.slot = 1,
.slot_pos = 3,
.allow_drop = TRUE,
.draw = w_p228_draw,
.holster = __NULL__,
.primary = w_p228_primary,
.secondary = __NULL__,
.reload = w_p228_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_p228_hud,
.precache = w_p228_precache,
.pickup = w_p228_pickup,
.updateammo = w_p228_updateammo,
.wmodel = w_p228_wmodel,
.pmodel = w_p228_pmodel,
.deathmsg = w_p228_deathmsg,
.aimanim = w_p228_aimanim,
.hudpic = w_p228_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_p90.c
View file

@ -247,26 +247,26 @@ w_p90_hudpic(int selected, vector pos, float a)
weapon_t w_p90 =
{
"p90",
ITEM_P90,
0,
3,
TRUE,
w_p90_draw,
__NULL__,
w_p90_primary,
__NULL__,
w_p90_reload,
w_cstrike_weaponrelease,
w_p90_hud,
w_p90_precache,
w_p90_pickup,
w_p90_updateammo,
w_p90_wmodel,
w_p90_pmodel,
w_p90_deathmsg,
w_p90_aimanim,
w_p90_hudpic
.name = "p90",
.id = ITEM_P90,
.slot = 0,
.slot_pos = 3,
.allow_drop = TRUE,
.draw = w_p90_draw,
.holster = __NULL__,
.primary = w_p90_primary,
.secondary = __NULL__,
.reload = w_p90_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_p90_hud,
.precache = w_p90_precache,
.pickup = w_p90_pickup,
.updateammo = w_p90_updateammo,
.wmodel = w_p90_wmodel,
.pmodel = w_p90_pmodel,
.deathmsg = w_p90_deathmsg,
.aimanim = w_p90_aimanim,
.hudpic = w_p90_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_para.c
View file

@ -243,26 +243,26 @@ w_para_hudpic(int selected, vector pos, float a)
weapon_t w_para =
{
"m249",
ITEM_PARA,
0,
15,
TRUE,
w_para_draw,
__NULL__,
w_para_primary,
__NULL__,
w_para_reload,
w_cstrike_weaponrelease,
w_para_hud,
w_para_precache,
w_para_pickup,
w_para_updateammo,
w_para_wmodel,
w_para_pmodel,
w_para_deathmsg,
w_para_aimanim,
w_para_hudpic
.name = "m249",
.id = ITEM_PARA,
.slot = 0,
.slot_pos = 15,
.allow_drop = TRUE,
.draw = w_para_draw,
.holster = __NULL__,
.primary = w_para_primary,
.secondary = __NULL__,
.reload = w_para_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_para_hud,
.precache = w_para_precache,
.pickup = w_para_pickup,
.updateammo = w_para_updateammo,
.wmodel = w_para_wmodel,
.pmodel = w_para_pmodel,
.deathmsg = w_para_deathmsg,
.aimanim = w_para_aimanim,
.hudpic = w_para_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_scout.c
View file

@ -295,26 +295,26 @@ w_scout_hudpic(int selected, vector pos, float a)
weapon_t w_scout =
{
"scout",
ITEM_SCOUT,
0,
11,
TRUE,
w_scout_draw,
__NULL__,
w_scout_primary,
w_scout_secondary,
w_scout_reload,
w_scout_release,
w_scout_hud,
w_scout_precache,
w_scout_pickup,
w_scout_updateammo,
w_scout_wmodel,
w_scout_pmodel,
w_scout_deathmsg,
w_scout_aimanim,
w_scout_hudpic
.name = "scout",
.id = ITEM_SCOUT,
.slot = 0,
.slot_pos = 11,
.allow_drop = TRUE,
.draw = w_scout_draw,
.holster = __NULL__,
.primary = w_scout_primary,
.secondary = w_scout_secondary,
.reload = w_scout_reload,
.release = w_scout_release,
.crosshair = w_scout_hud,
.precache = w_scout_precache,
.pickup = w_scout_pickup,
.updateammo = w_scout_updateammo,
.wmodel = w_scout_wmodel,
.pmodel = w_scout_pmodel,
.deathmsg = w_scout_deathmsg,
.aimanim = w_scout_aimanim,
.hudpic = w_scout_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_sg550.c
View file

@ -264,26 +264,26 @@ w_sg550_hudpic(int selected, vector pos, float a)
weapon_t w_sg550 =
{
"sg550",
ITEM_SG550,
0,
14,
TRUE,
w_sg550_draw,
__NULL__,
w_sg550_primary,
w_sg550_secondary,
w_sg550_reload,
w_cstrike_weaponrelease,
w_sg550_hud,
w_sg550_precache,
w_sg550_pickup,
w_sg550_updateammo,
w_sg550_wmodel,
w_sg550_pmodel,
w_sg550_deathmsg,
w_sg550_aimanim,
w_sg550_hudpic
.name = "sg550",
.id = ITEM_SG550,
.slot = 0,
.slot_pos = 14,
.allow_drop = TRUE,
.draw = w_sg550_draw,
.holster = __NULL__,
.primary = w_sg550_primary,
.secondary = w_sg550_secondary,
.reload = w_sg550_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_sg550_hud,
.precache = w_sg550_precache,
.pickup = w_sg550_pickup,
.updateammo = w_sg550_updateammo,
.wmodel = w_sg550_wmodel,
.pmodel = w_sg550_pmodel,
.deathmsg = w_sg550_deathmsg,
.aimanim = w_sg550_aimanim,
.hudpic = w_sg550_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_sg552.c
View file

@ -272,26 +272,26 @@ w_sg552_hudpic(int selected, vector pos, float a)
weapon_t w_sg552 =
{
"sg552",
ITEM_SG552,
0,
8,
TRUE,
w_sg552_draw,
__NULL__,
w_sg552_primary,
w_sg552_secondary,
w_sg552_reload,
w_cstrike_weaponrelease,
w_sg552_hud,
w_sg552_precache,
w_sg552_pickup,
w_sg552_updateammo,
w_sg552_wmodel,
w_sg552_pmodel,
w_sg552_deathmsg,
w_sg552_aimanim,
w_sg552_hudpic
.name = "sg552",
.id = ITEM_SG552,
.slot = 0,
.slot_pos = 8,
.allow_drop = TRUE,
.draw = w_sg552_draw,
.holster = __NULL__,
.primary = w_sg552_primary,
.secondary = w_sg552_secondary,
.reload = w_sg552_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_sg552_hud,
.precache = w_sg552_precache,
.pickup = w_sg552_pickup,
.updateammo = w_sg552_updateammo,
.wmodel = w_sg552_wmodel,
.pmodel = w_sg552_pmodel,
.deathmsg = w_sg552_deathmsg,
.aimanim = w_sg552_aimanim,
.hudpic = w_sg552_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_smokegrenade.c
View file

@ -261,26 +261,26 @@ w_smokegrenade_hudpic(int selected, vector pos, float a)
weapon_t w_smokegrenade =
{
"smokegrenade",
ITEM_SMOKEGRENADE,
3,
2,
FALSE,
w_smokegrenade_draw,
__NULL__,
w_smokegrenade_primary,
w_smokegrenade_release,
w_smokegrenade_release,
w_smokegrenade_release,
w_smokegrenade_hud,
w_smokegrenade_precache,
w_smokegrenade_pickup,
w_smokegrenade_updateammo,
w_smokegrenade_wmodel,
w_smokegrenade_pmodel,
w_smokegrenade_deathmsg,
w_smokegrenade_aimanim,
w_smokegrenade_hudpic
.name = "smokegrenade",
.id = ITEM_SMOKEGRENADE,
.slot = 3,
.slot_pos = 2,
.allow_drop = FALSE,
.draw = w_smokegrenade_draw,
.holster = __NULL__,
.primary = w_smokegrenade_primary,
.secondary = __NULL__,
.reload = __NULL__,
.release = w_smokegrenade_release,
.crosshair = w_smokegrenade_hud,
.precache = w_smokegrenade_precache,
.pickup = w_smokegrenade_pickup,
.updateammo = w_smokegrenade_updateammo,
.wmodel = w_smokegrenade_wmodel,
.pmodel = w_smokegrenade_pmodel,
.deathmsg = w_smokegrenade_deathmsg,
.aimanim = w_smokegrenade_aimanim,
.hudpic = w_smokegrenade_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_tmp.c
View file

@ -247,26 +247,26 @@ w_tmp_hudpic(int selected, vector pos, float a)
weapon_t w_tmp =
{
"tmp",
ITEM_TMP,
0,
6,
TRUE,
w_tmp_draw,
__NULL__,
w_tmp_primary,
__NULL__,
w_tmp_reload,
w_cstrike_weaponrelease,
w_tmp_hud,
w_tmp_precache,
w_tmp_pickup,
w_tmp_updateammo,
w_tmp_wmodel,
w_tmp_pmodel,
w_tmp_deathmsg,
w_tmp_aimanim,
w_tmp_hudpic
.name = "tmp",
.id = ITEM_TMP,
.slot = 0,
.slot_pos = 6,
.allow_drop = TRUE,
.draw = w_tmp_draw,
.holster = __NULL__,
.primary = w_tmp_primary,
.secondary = __NULL__,
.reload = w_tmp_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_tmp_hud,
.precache = w_tmp_precache,
.pickup = w_tmp_pickup,
.updateammo = w_tmp_updateammo,
.wmodel = w_tmp_wmodel,
.pmodel = w_tmp_pmodel,
.deathmsg = w_tmp_deathmsg,
.aimanim = w_tmp_aimanim,
.hudpic = w_tmp_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_ump45.c
View file

@ -247,26 +247,26 @@ w_ump45_hudpic(int selected, vector pos, float a)
weapon_t w_ump45 =
{
"ump45",
ITEM_UMP45,
0,
4,
TRUE,
w_ump45_draw,
__NULL__,
w_ump45_primary,
__NULL__,
w_ump45_reload,
w_cstrike_weaponrelease,
w_ump45_hud,
w_ump45_precache,
w_ump45_pickup,
w_ump45_updateammo,
w_ump45_wmodel,
w_ump45_pmodel,
w_ump45_deathmsg,
w_ump45_aimanim,
w_ump45_hudpic
.name = "ump45",
.id = ITEM_UMP45,
.slot = 0,
.slot_pos = 4,
.allow_drop = TRUE,
.draw = w_ump45_draw,
.holster = __NULL__,
.primary = w_ump45_primary,
.secondary = __NULL__,
.reload = w_ump45_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_ump45_hud,
.precache = w_ump45_precache,
.pickup = w_ump45_pickup,
.updateammo = w_ump45_updateammo,
.wmodel = w_ump45_wmodel,
.pmodel = w_ump45_pmodel,
.deathmsg = w_ump45_deathmsg,
.aimanim = w_ump45_aimanim,
.hudpic = w_ump45_hudpic
};
#ifdef SERVER

40
src/shared/cstrike/w_usp45.c
View file

@ -332,26 +332,26 @@ w_usp45_hudpic(int selected, vector pos, float a)
weapon_t w_usp45 =
{
"usp",
ITEM_USP45,
1,
0,
TRUE,
w_usp45_draw,
__NULL__,
w_usp45_primary,
w_usp45_secondary,
w_usp45_reload,
w_cstrike_weaponrelease,
w_usp45_hud,
w_usp45_precache,
w_usp45_pickup,
w_usp45_updateammo,
w_usp45_wmodel,
w_usp45_pmodel,
w_usp45_deathmsg,
w_usp45_aimanim,
w_usp45_hudpic
.name = "usp",
.id = ITEM_USP45,
.slot = 1,
.slot_pos = 0,
.allow_drop = TRUE,
.draw = w_usp45_draw,
.holster = __NULL__,
.primary = w_usp45_primary,
.secondary = w_usp45_secondary,
.reload = w_usp45_reload,
.release = w_cstrike_weaponrelease,
.crosshair = w_usp45_hud,
.precache = w_usp45_precache,
.pickup = w_usp45_pickup,
.updateammo = w_usp45_updateammo,
.wmodel = w_usp45_wmodel,
.pmodel = w_usp45_pmodel,
.deathmsg = w_usp45_deathmsg,
.aimanim = w_usp45_aimanim,
.hudpic = w_usp45_hudpic
};
#ifdef SERVER

2
src/shared/valve/w_satchel.c
View file

@ -285,7 +285,7 @@ weapon_t w_satchel =
.release = w_satchel_release,
.crosshair = w_satchel_hud,
.precache = w_satchel_precache,
.pickup = __NULL__,
.pickup = w_satchel_pickup,
.updateammo = w_satchel_updateammo,
.wmodel = w_satchel_wmodel,
.pmodel = w_satchel_pmodel,