diff --git a/src/shared/valve/w_crossbow.c b/src/shared/valve/w_crossbow.c index d05fe489..4fa99e07 100644 --- a/src/shared/valve/w_crossbow.c +++ b/src/shared/valve/w_crossbow.c @@ -365,27 +365,27 @@ w_crossbow_hudpic(int selected, vector pos, float a) weapon_t w_crossbow = { - ITEM_CROSSBOW, - 2, - 2, - "sprites/640hud1.spr_0.tga", - [48,16], - [192,80], - w_crossbow_draw, - w_crossbow_holster, - w_crossbow_primary, - w_crossbow_secondary, - w_crossbow_reload, - w_crossbow_release, - w_crossbow_crosshair, - w_crossbow_precache, - w_crossbow_pickup, - w_crossbow_updateammo, - w_crossbow_wmodel, - w_crossbow_pmodel, - w_crossbow_deathmsg, - w_crossbow_aimanim, - w_crossbow_hudpic + .id = ITEM_CROSSBOW, + .slot = 2, + .slot_pos = 2, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [48,16], + .ki_xy = [192,80], + .draw = w_crossbow_draw, + .holster = w_crossbow_holster, + .primary = w_crossbow_primary, + .secondary = w_crossbow_secondary, + .reload = w_crossbow_reload, + .release = w_crossbow_release, + .crosshair = w_crossbow_crosshair, + .precache = w_crossbow_precache, + .pickup = w_crossbow_pickup, + .updateammo = w_crossbow_updateammo, + .wmodel = w_crossbow_wmodel, + .pmodel = w_crossbow_pmodel, + .deathmsg = w_crossbow_deathmsg, + .aimanim = w_crossbow_aimanim, + .hudpic = w_crossbow_hudpic }; #ifdef SERVER diff --git a/src/shared/valve/w_egon.c b/src/shared/valve/w_egon.c index dddd741a..a682a232 100644 --- a/src/shared/valve/w_egon.c +++ b/src/shared/valve/w_egon.c @@ -187,27 +187,27 @@ void w_egon_hudpic(int selected, vector pos, float a) weapon_t w_egon = { - ITEM_EGON, - 3, - 2, - "sprites/640hud1.spr_0.tga", - [32,16], - [192,128], - w_egon_draw, - w_egon_holster, - w_egon_primary, - w_egon_secondary, - w_egon_reload, - w_egon_release, - w_egon_crosshair, - w_egon_precache, - w_egon_pickup, - w_egon_updateammo, - w_egon_wmodel, - w_egon_pmodel, - w_egon_deathmsg, - w_egon_aimanim, - w_egon_hudpic + .id = ITEM_EGON, + .slot = 3, + .slot_pos = 2, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [32,16], + .ki_xy = [192,128], + .draw = w_egon_draw, + .holster = w_egon_holster, + .primary = w_egon_primary, + .secondary = w_egon_secondary, + .reload = w_egon_reload, + .release = w_egon_release, + .crosshair = w_egon_crosshair, + .precache = w_egon_precache, + .pickup = w_egon_pickup, + .updateammo = w_egon_updateammo, + .wmodel = w_egon_wmodel, + .pmodel = w_egon_pmodel, + .deathmsg = w_egon_deathmsg, + .aimanim = w_egon_aimanim, + .hudpic = w_egon_hudpic }; #ifdef SERVER diff --git a/src/shared/valve/w_gauss.c b/src/shared/valve/w_gauss.c index c35b31e8..cc90d6ae 100644 --- a/src/shared/valve/w_gauss.c +++ b/src/shared/valve/w_gauss.c @@ -464,27 +464,27 @@ void w_gauss_hudpic(int selected, vector pos, float a) weapon_t w_gauss = { - ITEM_GAUSS, - 3, - 1, - "sprites/640hud1.spr_0.tga", - [32,16], - [192,112], - w_gauss_draw, - w_gauss_holster, - w_gauss_primary, - w_gauss_secondary, - __NULL__, - w_gauss_release, - w_gauss_crosshair, - w_gauss_precache, - w_gauss_pickup, - w_gauss_updateammo, - w_gauss_wmodel, - w_gauss_pmodel, - w_gauss_deathmsg, - w_gauss_aimanim, - w_gauss_hudpic + .id = ITEM_GAUSS, + .slot = 3, + .slot_pos = 1, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [32,16], + .ki_xy = [192,112], + .draw = w_gauss_draw, + .holster = w_gauss_holster, + .primary = w_gauss_primary, + .secondary = w_gauss_secondary, + .reload = __NULL__, + .release = w_gauss_release, + .crosshair = w_gauss_crosshair, + .precache = w_gauss_precache, + .pickup = w_gauss_pickup, + .updateammo = w_gauss_updateammo, + .wmodel = w_gauss_wmodel, + .pmodel = w_gauss_pmodel, + .deathmsg = w_gauss_deathmsg, + .aimanim = w_gauss_aimanim, + .hudpic = w_gauss_hudpic }; #ifdef SERVER diff --git a/src/shared/valve/w_glock.c b/src/shared/valve/w_glock.c index 2a3801a9..f4b10e0a 100644 --- a/src/shared/valve/w_glock.c +++ b/src/shared/valve/w_glock.c @@ -351,27 +351,27 @@ w_glock_hudpic(int selected, vector pos, float a) weapon_t w_glock = { - ITEM_GLOCK, - 1, - 0, - "sprites/640hud1.spr_0.tga", - [32,16], - [192,16], - w_glock_draw, - w_glock_holster, - w_glock_primary, - w_glock_secondary, - w_glock_reload, - w_glock_release, - w_glock_hud, - w_glock_precache, - w_glock_pickup, - w_glock_updateammo, - w_glock_wmodel, - w_glock_pmodel, - w_glock_deathmsg, - w_glock_aimanim, - w_glock_hudpic + .id = ITEM_GLOCK, + .slot = 1, + .slot_pos = 0, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [32,16], + .ki_xy = [192,16], + .draw = w_glock_draw, + .holster = w_glock_holster, + .primary = w_glock_primary, + .secondary = w_glock_secondary, + .reload = w_glock_reload, + .release = w_glock_release, + .crosshair = w_glock_hud, + .precache = w_glock_precache, + .pickup = w_glock_pickup, + .updateammo = w_glock_updateammo, + .wmodel = w_glock_wmodel, + .pmodel = w_glock_pmodel, + .deathmsg = w_glock_deathmsg, + .aimanim = w_glock_aimanim, + .hudpic = w_glock_hudpic }; /* pickups */ diff --git a/src/shared/valve/w_handgrenade.c b/src/shared/valve/w_handgrenade.c index e5ad4e9a..0822aaab 100644 --- a/src/shared/valve/w_handgrenade.c +++ b/src/shared/valve/w_handgrenade.c @@ -248,27 +248,27 @@ w_handgrenade_hudpic(int selected, vector pos, float a) weapon_t w_handgrenade = { - ITEM_HANDGRENADE, - 4, - 0, - "sprites/640hud1.spr_0.tga", - [32,16], - [192,160], - w_handgrenade_draw, - w_handgrenade_holster, - w_handgrenade_primary, - w_handgrenade_release, - w_handgrenade_release, - w_handgrenade_release, - w_handgrenade_hud, - w_handgrenade_precache, - w_handgrenade_pickup, - w_handgrenade_updateammo, - w_handgrenade_wmodel, - w_handgrenade_pmodel, - w_handgrenade_deathmsg, - w_handgrenade_aimanim, - w_handgrenade_hudpic + .id = ITEM_HANDGRENADE, + .slot = 4, + .slot_pos = 0, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [32,16], + .ki_xy = [192,160], + .draw = w_handgrenade_draw, + .holster = w_handgrenade_holster, + .primary = w_handgrenade_primary, + .secondary = __NULL__, + .reload = __NULL__, + .release = w_handgrenade_release, + .crosshair = w_handgrenade_hud, + .precache = w_handgrenade_precache, + .pickup = w_handgrenade_pickup, + .updateammo = w_handgrenade_updateammo, + .wmodel = w_handgrenade_wmodel, + .pmodel = w_handgrenade_pmodel, + .deathmsg = w_handgrenade_deathmsg, + .aimanim = w_handgrenade_aimanim, + .hudpic = w_handgrenade_hudpic }; #ifdef SERVER diff --git a/src/shared/valve/w_hornetgun.c b/src/shared/valve/w_hornetgun.c index f260f0d0..d10f2274 100644 --- a/src/shared/valve/w_hornetgun.c +++ b/src/shared/valve/w_hornetgun.c @@ -323,27 +323,27 @@ w_hornetgun_hudpic(int selected, vector pos, float a) weapon_t w_hornetgun = { - ITEM_HORNETGUN, - 3, - 3, - "sprites/640hud1.spr_0.tga", - [48,16], - [192,144], - w_hornetgun_draw, - w_hornetgun_holster, - w_hornetgun_primary, - w_hornetgun_secondary, - __NULL__, - w_hornetgun_release, - w_hornetgun_crosshair, - w_hornetgun_precache, - w_hornetgun_pickup, - w_hornetgun_updateammo, - w_hornetgun_wmodel, - w_hornetgun_pmodel, - w_hornetgun_deathmsg, - w_hornetgun_aimanim, - w_hornetgun_hudpic + .id = ITEM_HORNETGUN, + .slot = 3, + .slot_pos = 3, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [48,16], + .ki_xy = [192,144], + .draw = w_hornetgun_draw, + .holster = w_hornetgun_holster, + .primary = w_hornetgun_primary, + .secondary = w_hornetgun_secondary, + .reload = __NULL__, + .release = w_hornetgun_release, + .crosshair = w_hornetgun_crosshair, + .precache = w_hornetgun_precache, + .pickup = w_hornetgun_pickup, + .updateammo = w_hornetgun_updateammo, + .wmodel = w_hornetgun_wmodel, + .pmodel = w_hornetgun_pmodel, + .deathmsg = w_hornetgun_deathmsg, + .aimanim = w_hornetgun_aimanim, + .hudpic = w_hornetgun_hudpic }; #ifdef SERVER diff --git a/src/shared/valve/w_mp5.c b/src/shared/valve/w_mp5.c index 3438088b..f8a0c010 100644 --- a/src/shared/valve/w_mp5.c +++ b/src/shared/valve/w_mp5.c @@ -371,27 +371,27 @@ w_mp5_hudpic(int selected, vector pos, float a) } weapon_t w_mp5 = { - ITEM_MP5, - 2, - 0, - "sprites/640hud1.spr_0.tga", - [48,16], - [192,48], - w_mp5_draw, - w_mp5_holster, - w_mp5_primary, - w_mp5_secondary, - w_mp5_reload, - w_mp5_release, - w_mp5_crosshair, - w_mp5_precache, - w_mp5_pickup, - w_mp5_updateammo, - w_mp5_wmodel, - w_mp5_pmodel, - w_mp5_deathmsg, - w_mp5_aimanim, - w_mp5_hudpic + .id = ITEM_MP5, + .slot = 2, + .slot_pos = 0, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [48,16], + .ki_xy = [192,48], + .draw = w_mp5_draw, + .holster = w_mp5_holster, + .primary = w_mp5_primary, + .secondary = w_mp5_secondary, + .reload = w_mp5_reload, + .release = w_mp5_release, + .crosshair = w_mp5_crosshair, + .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 diff --git a/src/shared/valve/w_python.c b/src/shared/valve/w_python.c index a161eb12..9a3c09ee 100644 --- a/src/shared/valve/w_python.c +++ b/src/shared/valve/w_python.c @@ -330,27 +330,27 @@ w_python_hudpic(int selected, vector pos, float a) weapon_t w_python = { - ITEM_PYTHON, - 1, - 1, - "sprites/640hud1.spr_0.tga", - [32,16], - [192,32], - w_python_draw, - w_python_holster, - w_python_primary, - w_python_secondary, - w_python_reload, - w_python_release, - w_python_crosshair, - w_python_precache, - w_python_pickup, - w_python_updateammo, - w_python_wmodel, - w_python_pmodel, - w_python_deathmsg, - w_python_aimanim, - w_python_hudpic + .id = ITEM_PYTHON, + .slot = 1, + .slot_pos = 1, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [32,16], + .ki_xy = [192,32], + .draw = w_python_draw, + .holster = w_python_holster, + .primary = w_python_primary, + .secondary = w_python_secondary, + .reload = w_python_reload, + .release = w_python_release, + .crosshair = w_python_crosshair, + .precache = w_python_precache, + .pickup = w_python_pickup, + .updateammo = w_python_updateammo, + .wmodel = w_python_wmodel, + .pmodel = w_python_pmodel, + .deathmsg = w_python_deathmsg, + .aimanim = w_python_aimanim, + .hudpic = w_python_hudpic }; /* pickups */ diff --git a/src/shared/valve/w_rpg.c b/src/shared/valve/w_rpg.c index 8ca13c97..051dad6f 100644 --- a/src/shared/valve/w_rpg.c +++ b/src/shared/valve/w_rpg.c @@ -341,27 +341,27 @@ void w_rpg_hud(void) weapon_t w_rpg = { - ITEM_RPG, - 3, - 0, - "sprites/640hud1.spr_0.tga", - [48,16], - [192,96], - w_rpg_draw, - w_rpg_holster, - w_rpg_primary, - w_rpg_secondary, - w_rpg_reload, - w_rpg_release, - w_rpg_hud, - w_rpg_precache, - w_rpg_pickup, - w_rpg_updateammo, - w_rpg_wmodel, - w_rpg_pmodel, - w_rpg_deathmsg, - w_rpg_aimanim, - w_rpg_hudpic + .id = ITEM_RPG, + .slot = 3, + .slot_pos = 0, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [48,16], + .ki_xy = [192,96], + .draw = w_rpg_draw, + .holster = w_rpg_holster, + .primary = w_rpg_primary, + .secondary = w_rpg_secondary, + .reload = w_rpg_reload, + .release = w_rpg_release, + .crosshair = w_rpg_hud, + .precache = w_rpg_precache, + .pickup = w_rpg_pickup, + .updateammo = w_rpg_updateammo, + .wmodel = w_rpg_wmodel, + .pmodel = w_rpg_pmodel, + .deathmsg = w_rpg_deathmsg, + .aimanim = w_rpg_aimanim, + .hudpic = w_rpg_hudpic }; #ifdef SERVER diff --git a/src/shared/valve/w_satchel.c b/src/shared/valve/w_satchel.c index 1d333fd0..3db0f240 100644 --- a/src/shared/valve/w_satchel.c +++ b/src/shared/valve/w_satchel.c @@ -273,27 +273,27 @@ void w_satchel_hudpic(int selected, vector pos, float a) weapon_t w_satchel = { - ITEM_SATCHEL, - 4, - 1, - "sprites/640hud1.spr_0.tga", - [32,16], - [192,176], - w_satchel_draw, - w_satchel_holster, - w_satchel_primary, - w_satchel_secondary, - w_satchel_reload, - w_satchel_release, - w_satchel_hud, - w_satchel_precache, - w_satchel_pickup, - w_satchel_updateammo, - w_satchel_wmodel, - w_satchel_pmodel, - w_satchel_deathmsg, - w_satchel_aimanim, - w_satchel_hudpic + .id = ITEM_SATCHEL, + .slot = 4, + .slot_pos = 1, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [32,16], + .ki_xy = [192,176], + .draw = w_satchel_draw, + .holster = w_satchel_holster, + .primary = w_satchel_primary, + .secondary = w_satchel_secondary, + .reload = w_satchel_reload, + .release = w_satchel_release, + .crosshair = w_satchel_hud, + .precache = w_satchel_precache, + .pickup = __NULL__, + .updateammo = w_satchel_updateammo, + .wmodel = w_satchel_wmodel, + .pmodel = w_satchel_pmodel, + .deathmsg = w_satchel_deathmsg, + .aimanim = w_satchel_aimanim, + .hudpic = w_satchel_hudpic }; #ifdef SERVER diff --git a/src/shared/valve/w_shotgun.c b/src/shared/valve/w_shotgun.c index aaa92df2..a4812c27 100644 --- a/src/shared/valve/w_shotgun.c +++ b/src/shared/valve/w_shotgun.c @@ -301,27 +301,27 @@ void w_shotgun_hudpic(int selected, vector pos, float a) weapon_t w_shotgun = { - ITEM_SHOTGUN, - 2, - 1, - "sprites/640hud1.spr_0.tga", - [48,16], - [192,64], - w_shotgun_draw, - w_shotgun_holster, - w_shotgun_primary, - w_shotgun_secondary, - w_shotgun_reload, - w_shotgun_release, - w_shotgun_crosshair, - w_shotgun_precache, - w_shotgun_pickup, - w_shotgun_updateammo, - w_shotgun_wmodel, - w_shotgun_pmodel, - w_shotgun_deathmsg, - w_shotgun_aimanim, - w_shotgun_hudpic + .id = ITEM_SHOTGUN, + .slot = 2, + .slot_pos = 1, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [48,16], + .ki_xy = [192,64], + .draw = w_shotgun_draw, + .holster = w_shotgun_holster, + .primary = w_shotgun_primary, + .secondary = w_shotgun_secondary, + .reload = w_shotgun_reload, + .release = w_shotgun_release, + .crosshair = w_shotgun_crosshair, + .precache = w_shotgun_precache, + .pickup = w_shotgun_pickup, + .updateammo = w_shotgun_updateammo, + .wmodel = w_shotgun_wmodel, + .pmodel = w_shotgun_pmodel, + .deathmsg = w_shotgun_deathmsg, + .aimanim = w_shotgun_aimanim, + .hudpic = w_shotgun_hudpic }; #ifdef SERVER diff --git a/src/shared/valve/w_snark.c b/src/shared/valve/w_snark.c index 6bdaa39a..10a4fa2a 100644 --- a/src/shared/valve/w_snark.c +++ b/src/shared/valve/w_snark.c @@ -304,27 +304,27 @@ void w_snark_hudpic(int selected, vector pos, float a) weapon_t w_snark = { - ITEM_SNARK, - 4, - 3, - "sprites/640hud1.spr_0.tga", - [32,16], - [192,208], - w_snark_draw, - w_snark_holster, - w_snark_primary, - w_snark_secondary, - w_snark_reload, - w_snark_release, - w_snark_hud, - w_snark_precache, - w_snark_pickup, - w_snark_updateammo, - w_snark_wmodel, - w_snark_pmodel, - w_snark_deathmsg, - w_snark_aimanim, - w_snark_hudpic + .id = ITEM_SNARK, + .slot = 4, + .slot_pos = 3, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [32,16], + .ki_xy = [192,208], + .draw = w_snark_draw, + .holster = w_snark_holster, + .primary = w_snark_primary, + .secondary = w_snark_secondary, + .reload = w_snark_reload, + .release = w_snark_release, + .crosshair = w_snark_hud, + .precache = w_snark_precache, + .pickup = w_snark_pickup, + .updateammo = w_snark_updateammo, + .wmodel = w_snark_wmodel, + .pmodel = w_snark_pmodel, + .deathmsg = w_snark_deathmsg, + .aimanim = w_snark_aimanim, + .hudpic = w_snark_hudpic }; #ifdef SERVER diff --git a/src/shared/valve/w_tripmine.c b/src/shared/valve/w_tripmine.c index 42df66f2..70859a7b 100644 --- a/src/shared/valve/w_tripmine.c +++ b/src/shared/valve/w_tripmine.c @@ -341,27 +341,27 @@ void w_tripmine_hudpic(int selected, vector pos, float a) weapon_t w_tripmine = { - ITEM_TRIPMINE, - 4, - 2, - "sprites/640hud1.spr_0.tga", - [32,16], - [192,192], - w_tripmine_draw, - w_tripmine_holster, - w_tripmine_primary, - w_tripmine_release, - w_tripmine_release, - w_tripmine_release, - w_tripmine_hud, - w_tripmine_precache, - w_tripmine_pickup, - w_tripmine_updateammo, - w_tripmine_wmodel, - w_tripmine_pmodel, - w_tripmine_deathmsg, - w_tripmine_aimanim, - w_tripmine_hudpic + .id = ITEM_TRIPMINE, + .slot = 4, + .slot_pos = 2, + .ki_spr = "sprites/640hud1.spr_0.tga", + .ki_size = [32,16], + .ki_xy = [192,192], + .draw = w_tripmine_draw, + .holster = w_tripmine_holster, + .primary = w_tripmine_primary, + .secondary = __NULL__, + .reload = __NULL__, + .release = w_tripmine_release, + .crosshair = w_tripmine_hud, + .precache = w_tripmine_precache, + .pickup = w_tripmine_pickup, + .updateammo = w_tripmine_updateammo, + .wmodel = w_tripmine_wmodel, + .pmodel = w_tripmine_pmodel, + .deathmsg = w_tripmine_deathmsg, + .aimanim = w_tripmine_aimanim, + .hudpic = w_tripmine_hudpic }; #ifdef SERVER