From 7f848a6fdea58d51f0ceb0a59d52ee7cf17c3328 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Tue, 17 Jan 2023 11:58:35 -0800 Subject: [PATCH] Add isempty weapon functions to stop the hud selection from crashing. --- src/shared/w_asscan.qc | 9 ++++++++- src/shared/w_autorifle.qc | 3 ++- src/shared/w_crowbar.qc | 3 ++- src/shared/w_dbs.qc | 3 ++- src/shared/w_flamer.qc | 3 ++- src/shared/w_glauncher.qc | 3 ++- src/shared/w_grapple.qc | 3 ++- src/shared/w_incendiary.qc | 3 ++- src/shared/w_knife.qc | 3 ++- src/shared/w_medkit.qc | 3 ++- src/shared/w_nailgun.qc | 3 ++- src/shared/w_pipebomb.qc | 3 ++- src/shared/w_railgun.qc | 3 ++- src/shared/w_rpg.qc | 3 ++- src/shared/w_sbs.qc | 3 ++- src/shared/w_sniper.qc | 3 ++- src/shared/w_supernail.qc | 3 ++- src/shared/w_tranquil.qc | 3 ++- src/shared/w_umbrella.qc | 3 ++- src/shared/w_wrench.qc | 3 ++- 20 files changed, 46 insertions(+), 20 deletions(-) diff --git a/src/shared/w_asscan.qc b/src/shared/w_asscan.qc index c50bb2f..55be788 100644 --- a/src/shared/w_asscan.qc +++ b/src/shared/w_asscan.qc @@ -88,6 +88,12 @@ w_asscan_hudpic(player pl, int selected, vector pos, float a) #endif } +int +w_asscan_isempty(player pl) +{ + return 0; +} + weapon_t w_asscan = { .name = "asscan", @@ -108,5 +114,6 @@ weapon_t w_asscan = .pmodel = w_asscan_pmodel, .deathmsg = w_asscan_deathmsg, .aimanim = w_asscan_aimanim, - .hudpic = w_asscan_hudpic + .hudpic = w_asscan_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_autorifle.qc b/src/shared/w_autorifle.qc index db5c98b..ee99e80 100644 --- a/src/shared/w_autorifle.qc +++ b/src/shared/w_autorifle.qc @@ -191,5 +191,6 @@ weapon_t w_autorifle = .pmodel = w_autorifle_pmodel, .deathmsg = w_autorifle_deathmsg, .aimanim = w_autorifle_aimanim, - .hudpic = w_autorifle_hudpic + .hudpic = w_autorifle_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_crowbar.qc b/src/shared/w_crowbar.qc index b30ae61..4668b17 100644 --- a/src/shared/w_crowbar.qc +++ b/src/shared/w_crowbar.qc @@ -223,5 +223,6 @@ weapon_t w_crowbar = .pmodel = w_crowbar_pmodel, .deathmsg = w_crowbar_deathmsg, .aimanim = w_crowbar_aimanim, - .hudpic = w_crowbar_hudpic + .hudpic = w_crowbar_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_dbs.qc b/src/shared/w_dbs.qc index bffaa93..9399a6b 100644 --- a/src/shared/w_dbs.qc +++ b/src/shared/w_dbs.qc @@ -211,5 +211,6 @@ weapon_t w_dbs = .pmodel = w_dbs_pmodel, .deathmsg = w_dbs_deathmsg, .aimanim = w_dbs_aimanim, - .hudpic = w_dbs_hudpic + .hudpic = w_dbs_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_flamer.qc b/src/shared/w_flamer.qc index 285f364..98eb099 100644 --- a/src/shared/w_flamer.qc +++ b/src/shared/w_flamer.qc @@ -110,5 +110,6 @@ weapon_t w_flamer = .pmodel = w_flamer_pmodel, .deathmsg = w_flamer_deathmsg, .aimanim = w_flamer_aimanim, - .hudpic = w_flamer_hudpic + .hudpic = w_flamer_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_glauncher.qc b/src/shared/w_glauncher.qc index 936f4c0..edd79f0 100644 --- a/src/shared/w_glauncher.qc +++ b/src/shared/w_glauncher.qc @@ -110,5 +110,6 @@ weapon_t w_glauncher = .pmodel = w_glauncher_pmodel, .deathmsg = w_glauncher_deathmsg, .aimanim = w_glauncher_aimanim, - .hudpic = w_glauncher_hudpic + .hudpic = w_glauncher_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_grapple.qc b/src/shared/w_grapple.qc index f98137b..0753c25 100644 --- a/src/shared/w_grapple.qc +++ b/src/shared/w_grapple.qc @@ -110,5 +110,6 @@ weapon_t w_grapple = .pmodel = w_grapple_pmodel, .deathmsg = w_grapple_deathmsg, .aimanim = w_grapple_aimanim, - .hudpic = w_grapple_hudpic + .hudpic = w_grapple_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_incendiary.qc b/src/shared/w_incendiary.qc index fc514da..a3f8084 100644 --- a/src/shared/w_incendiary.qc +++ b/src/shared/w_incendiary.qc @@ -110,5 +110,6 @@ weapon_t w_incendiary = .pmodel = w_incendiary_pmodel, .deathmsg = w_incendiary_deathmsg, .aimanim = w_incendiary_aimanim, - .hudpic = w_incendiary_hudpic + .hudpic = w_incendiary_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_knife.qc b/src/shared/w_knife.qc index 19a7db0..aa2e492 100644 --- a/src/shared/w_knife.qc +++ b/src/shared/w_knife.qc @@ -110,5 +110,6 @@ weapon_t w_knife = .pmodel = w_knife_pmodel, .deathmsg = w_knife_deathmsg, .aimanim = w_knife_aimanim, - .hudpic = w_knife_hudpic + .hudpic = w_knife_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_medkit.qc b/src/shared/w_medkit.qc index 8a859aa..69511bf 100644 --- a/src/shared/w_medkit.qc +++ b/src/shared/w_medkit.qc @@ -110,5 +110,6 @@ weapon_t w_medkit = .pmodel = w_medkit_pmodel, .deathmsg = w_medkit_deathmsg, .aimanim = w_medkit_aimanim, - .hudpic = w_medkit_hudpic + .hudpic = w_medkit_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_nailgun.qc b/src/shared/w_nailgun.qc index 5364769..12c6597 100644 --- a/src/shared/w_nailgun.qc +++ b/src/shared/w_nailgun.qc @@ -221,5 +221,6 @@ weapon_t w_nailgun = .pmodel = w_nailgun_pmodel, .deathmsg = w_nailgun_deathmsg, .aimanim = w_nailgun_aimanim, - .hudpic = w_nailgun_hudpic + .hudpic = w_nailgun_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_pipebomb.qc b/src/shared/w_pipebomb.qc index 9019c43..0591a6b 100644 --- a/src/shared/w_pipebomb.qc +++ b/src/shared/w_pipebomb.qc @@ -111,5 +111,6 @@ weapon_t w_pipebomb = .pmodel = w_pipebomb_pmodel, .deathmsg = w_pipebomb_deathmsg, .aimanim = w_pipebomb_aimanim, - .hudpic = w_pipebomb_hudpic + .hudpic = w_pipebomb_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_railgun.qc b/src/shared/w_railgun.qc index db0596f..dab3db6 100644 --- a/src/shared/w_railgun.qc +++ b/src/shared/w_railgun.qc @@ -110,5 +110,6 @@ weapon_t w_railgun = .pmodel = w_railgun_pmodel, .deathmsg = w_railgun_deathmsg, .aimanim = w_railgun_aimanim, - .hudpic = w_railgun_hudpic + .hudpic = w_railgun_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_rpg.qc b/src/shared/w_rpg.qc index 98c0163..31e407e 100644 --- a/src/shared/w_rpg.qc +++ b/src/shared/w_rpg.qc @@ -246,5 +246,6 @@ weapon_t w_rpg = .pmodel = w_rpg_pmodel, .deathmsg = w_rpg_deathmsg, .aimanim = w_rpg_aimanim, - .hudpic = w_rpg_hudpic + .hudpic = w_rpg_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_sbs.qc b/src/shared/w_sbs.qc index 92cad36..b30fbb5 100644 --- a/src/shared/w_sbs.qc +++ b/src/shared/w_sbs.qc @@ -200,5 +200,6 @@ weapon_t w_sbs = .pmodel = w_sbs_pmodel, .deathmsg = w_sbs_deathmsg, .aimanim = w_sbs_aimanim, - .hudpic = w_sbs_hudpic + .hudpic = w_sbs_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_sniper.qc b/src/shared/w_sniper.qc index c342443..7446c38 100644 --- a/src/shared/w_sniper.qc +++ b/src/shared/w_sniper.qc @@ -110,5 +110,6 @@ weapon_t w_sniper = .pmodel = w_sniper_pmodel, .deathmsg = w_sniper_deathmsg, .aimanim = w_sniper_aimanim, - .hudpic = w_sniper_hudpic + .hudpic = w_sniper_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_supernail.qc b/src/shared/w_supernail.qc index 0b5050e..8b2361b 100644 --- a/src/shared/w_supernail.qc +++ b/src/shared/w_supernail.qc @@ -110,5 +110,6 @@ weapon_t w_supernail = .pmodel = w_supernail_pmodel, .deathmsg = w_supernail_deathmsg, .aimanim = w_supernail_aimanim, - .hudpic = w_supernail_hudpic + .hudpic = w_supernail_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_tranquil.qc b/src/shared/w_tranquil.qc index 6cc7919..75328a0 100644 --- a/src/shared/w_tranquil.qc +++ b/src/shared/w_tranquil.qc @@ -110,5 +110,6 @@ weapon_t w_tranquil = .pmodel = w_tranquil_pmodel, .deathmsg = w_tranquil_deathmsg, .aimanim = w_tranquil_aimanim, - .hudpic = w_tranquil_hudpic + .hudpic = w_tranquil_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_umbrella.qc b/src/shared/w_umbrella.qc index 72a2ab8..06210a2 100644 --- a/src/shared/w_umbrella.qc +++ b/src/shared/w_umbrella.qc @@ -229,5 +229,6 @@ weapon_t w_umbrella = .pmodel = w_umbrella_pmodel, .deathmsg = w_umbrella_deathmsg, .aimanim = w_umbrella_aimanim, - .hudpic = w_umbrella_hudpic + .hudpic = w_umbrella_hudpic, + .isempty = w_asscan_isempty }; diff --git a/src/shared/w_wrench.qc b/src/shared/w_wrench.qc index bbcb2ae..f34215f 100644 --- a/src/shared/w_wrench.qc +++ b/src/shared/w_wrench.qc @@ -246,5 +246,6 @@ weapon_t w_wrench = .pmodel = w_wrench_pmodel, .deathmsg = w_wrench_deathmsg, .aimanim = w_wrench_aimanim, - .hudpic = w_wrench_hudpic + .hudpic = w_wrench_hudpic, + .isempty = w_asscan_isempty };