From: Samual Lenks Date: Sun, 5 Jan 2014 18:39:38 +0000 (-0500) Subject: Unhandled weapon requests from weapon functions should return FALSE X-Git-Tag: xonotic-v0.8.0~152^2~127 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68b8807117d2872b30b100189d0368b79f25a238;p=xonotic%2Fxonotic-data.pk3dir.git Unhandled weapon requests from weapon functions should return FALSE --- diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index ed91cce1f6..5f7ca4169f 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -288,7 +288,7 @@ float W_Arc(float req) return TRUE; } } - return TRUE; + return FALSE; } void ArcInit() @@ -338,7 +338,7 @@ float W_Arc(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc index f39d35e609..9509b7b8ee 100644 --- a/qcsrc/common/weapons/w_blaster.qc +++ b/qcsrc/common/weapons/w_blaster.qc @@ -257,8 +257,7 @@ float W_Blaster(float request) return WEAPON_BLASTER_MURDER; } } - - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -286,8 +285,7 @@ float W_Blaster(float request) return FALSE; } } - - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc index 68d742cefd..7827df023c 100644 --- a/qcsrc/common/weapons/w_crylink.qc +++ b/qcsrc/common/weapons/w_crylink.qc @@ -684,7 +684,7 @@ float W_Crylink(float req) return WEAPON_CRYLINK_MURDER; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -723,7 +723,7 @@ float W_Crylink(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc index 9c27506859..0a559fb6d3 100644 --- a/qcsrc/common/weapons/w_devastator.qc +++ b/qcsrc/common/weapons/w_devastator.qc @@ -577,7 +577,7 @@ float W_Devastator(float req) return WEAPON_DEVASTATOR_MURDER_DIRECT; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -606,7 +606,7 @@ float W_Devastator(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc index c9104da373..801fbb091c 100644 --- a/qcsrc/common/weapons/w_electro.qc +++ b/qcsrc/common/weapons/w_electro.qc @@ -546,7 +546,7 @@ float W_Electro(float req) } } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -595,7 +595,7 @@ float W_Electro(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc index d6f7129b4b..1c9552f2dc 100644 --- a/qcsrc/common/weapons/w_fireball.qc +++ b/qcsrc/common/weapons/w_fireball.qc @@ -442,7 +442,7 @@ float W_Fireball(float req) return WEAPON_FIREBALL_MURDER_BLAST; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -478,8 +478,7 @@ float W_Fireball(float req) return FALSE; } } - - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc index 981c7745fe..dde0a755b1 100644 --- a/qcsrc/common/weapons/w_hagar.qc +++ b/qcsrc/common/weapons/w_hagar.qc @@ -514,7 +514,7 @@ float W_Hagar(float req) return WEAPON_HAGAR_MURDER_SPRAY; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -552,7 +552,7 @@ float W_Hagar(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc index a154e96f01..323a5b91d0 100644 --- a/qcsrc/common/weapons/w_hlac.qc +++ b/qcsrc/common/weapons/w_hlac.qc @@ -277,7 +277,7 @@ float W_HLAC(float req) return WEAPON_HLAC_MURDER; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -306,7 +306,7 @@ float W_HLAC(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc index ca94ace96e..05a1ff41bd 100644 --- a/qcsrc/common/weapons/w_hook.qc +++ b/qcsrc/common/weapons/w_hook.qc @@ -331,7 +331,7 @@ float W_Hook(float req) return WEAPON_HOOK_MURDER; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -360,7 +360,7 @@ float W_Hook(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc index 949bfea8f8..55ff1aaba5 100644 --- a/qcsrc/common/weapons/w_machinegun.qc +++ b/qcsrc/common/weapons/w_machinegun.qc @@ -364,7 +364,7 @@ float W_MachineGun(float req) return WEAPON_MACHINEGUN_MURDER_SPRAY; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -400,7 +400,7 @@ float W_MachineGun(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc index f2dd049278..9483769a50 100644 --- a/qcsrc/common/weapons/w_minelayer.qc +++ b/qcsrc/common/weapons/w_minelayer.qc @@ -584,7 +584,7 @@ float W_MineLayer(float req) return WEAPON_MINELAYER_MURDER; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -613,7 +613,7 @@ float W_MineLayer(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc index 7f46159899..005dd645e1 100644 --- a/qcsrc/common/weapons/w_mortar.qc +++ b/qcsrc/common/weapons/w_mortar.qc @@ -454,7 +454,7 @@ float W_Mortar(float req) return WEAPON_MORTAR_MURDER_EXPLODE; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -483,7 +483,7 @@ float W_Mortar(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc index 9450776018..8c2b6e6cda 100644 --- a/qcsrc/common/weapons/w_porto.qc +++ b/qcsrc/common/weapons/w_porto.qc @@ -391,7 +391,7 @@ float W_Porto(float req) return TRUE; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -415,7 +415,7 @@ float W_Porto(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc index 1836811ba3..0e7a7ca0cd 100644 --- a/qcsrc/common/weapons/w_rifle.qc +++ b/qcsrc/common/weapons/w_rifle.qc @@ -259,7 +259,7 @@ float W_Rifle(float req) } } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -309,8 +309,7 @@ float W_Rifle(float req) } } } - - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc index deaa93ea4e..5e814b44db 100644 --- a/qcsrc/common/weapons/w_seeker.qc +++ b/qcsrc/common/weapons/w_seeker.qc @@ -720,7 +720,7 @@ float W_Seeker(float req) return WEAPON_SEEKER_MURDER_SPRAY; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -785,8 +785,7 @@ float W_Seeker(float req) return FALSE; } } - - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc index fa42e78aa1..4a02f6ea62 100644 --- a/qcsrc/common/weapons/w_shockwave.qc +++ b/qcsrc/common/weapons/w_shockwave.qc @@ -714,7 +714,7 @@ float W_Shockwave(float req) return WEAPON_SHOCKWAVE_MURDER; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -742,7 +742,7 @@ float W_Shockwave(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc index a304240bf1..2138635cc8 100644 --- a/qcsrc/common/weapons/w_shotgun.qc +++ b/qcsrc/common/weapons/w_shotgun.qc @@ -282,8 +282,7 @@ float W_Shotgun(float req) return WEAPON_SHOTGUN_MURDER; } } - - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -323,7 +322,7 @@ float W_Shotgun(float req) return FALSE; } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc index 238c561ac3..560422d0e0 100644 --- a/qcsrc/common/weapons/w_tuba.qc +++ b/qcsrc/common/weapons/w_tuba.qc @@ -483,7 +483,7 @@ float W_Tuba(float req) return WEAPON_TUBA_MURDER; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -501,7 +501,7 @@ float W_Tuba(float req) } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_vaporizer.qc b/qcsrc/common/weapons/w_vaporizer.qc index 674ecc7eef..1a5d3e7c93 100644 --- a/qcsrc/common/weapons/w_vaporizer.qc +++ b/qcsrc/common/weapons/w_vaporizer.qc @@ -247,7 +247,7 @@ float W_Vaporizer(float req) return WEAPON_VAPORIZER_MURDER; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -288,7 +288,7 @@ float W_Vaporizer(float req) } } } - return TRUE; + return FALSE; } #endif #endif diff --git a/qcsrc/common/weapons/w_vortex.qc b/qcsrc/common/weapons/w_vortex.qc index 9f8c55cd93..ed2e367ece 100644 --- a/qcsrc/common/weapons/w_vortex.qc +++ b/qcsrc/common/weapons/w_vortex.qc @@ -292,7 +292,7 @@ float W_Vortex(float req) return WEAPON_VORTEX_MURDER; } } - return TRUE; + return FALSE; } #endif #ifdef CSQC @@ -334,7 +334,7 @@ float W_Vortex(float req) } } } - return TRUE; + return FALSE; } #endif #endif