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 ed91cce1f65c031f1793b769e300eac1e506c837..5f7ca4169f12827283b9eb8488574a8ca2887a8b 100644 (file)
--- 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 f39d35e6090e96c09d46d1e41a4af1903ecb52b4..9509b7b8eeb8f9d6e4ca70128658d59ea5e536de 100644 (file)
--- 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 68d742cefdd889ba7ed91f728d24865c24d9c4bb..7827df023c669adddc723d68a55f01d82fa3b891 100644 (file)
--- 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 9c2750685929cff3587eb56d0510d42490f01e19..0a559fb6d3e6713a481a06e44be17ea09f537c5f 100644 (file)
--- 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 c9104da373caa5b49434b830b1334e3e065f81da..801fbb091c74543db1ef93c8f275452342fa1530 100644 (file)
--- 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 d6f7129b4bd4a6b7f32d25f95d78efbcbc04f0db..1c9552f2dc15d4f2a89b4495dc5daea8fef28ca0 100644 (file)
--- 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 981c7745fe8df291e3be10816c28841ff438e0bb..dde0a755b136d5307981407ee6b72de0aafd3e69 100644 (file)
--- 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 a154e96f01b28ef3a94aacef0dcecef3daa113eb..323a5b91d0242c4e6943e8a8acd38752798ae246 100644 (file)
--- 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 ca94ace96e1cfe6ea1bcb87d8200ef0ffc04c673..05a1ff41bd18ce8a050140d2b97d408a97a8034e 100644 (file)
--- 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 949bfea8f872efd0b7163eb9771bc52cb3c08312..55ff1aaba5353d293514ac05a3ef7bcd5aa719c5 100644 (file)
--- 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 f2dd04927861c7d031b556a8365800ad497c521b..9483769a504b6425b46790750eab0502f554ec0b 100644 (file)
--- 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 7f461598991290f328a66f9c36dffd10734d4cf9..005dd645e10462bfc19de92a786d054475843588 100644 (file)
--- 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 945077601890432e796e7c55e4d5c8832f124ad7..8c2b6e6cda37312e5021211eb809aef1752bb715 100644 (file)
--- 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 1836811ba3f98e5dac8f74f1e06c5a8b7037110a..0e7a7ca0cd00d24f422e192834589ab8126fe714 100644 (file)
--- 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 deaa93ea4e7a321f2cb877ea93ae826b6fe361ca..5e814b44dba3e481966141695869d603b0098cd7 100644 (file)
--- 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 fa42e78aa1d69bd56beaf02e5a2b6ebfdea1989d..4a02f6ea62e22226251d91c78d368477431997fc 100644 (file)
--- 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 a304240bf18e0f239de972284d615f11f6da30a7..2138635cc8cbad78be46862d0688fa8802c0affb 100644 (file)
--- 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 238c561ac3f8f0d15b6a7a77c22964215ed29152..560422d0e00f2311e82d3d848d0931c28ae1a076 100644 (file)
--- 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 674ecc7eefa09ca5c9764552049ff9a10c15a95b..1a5d3e7c935257a31e1a21e17d911040ee21a7f4 100644 (file)
--- 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 9f8c55cd932e23c7dfff921bf9237150b2c24694..ed2e367ece002056402e3ed66b1ccb0bd3a4ca8f 100644 (file)
--- 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