]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix some code that was defined in the client part of the weapons code by mistake
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 22 Jan 2011 13:07:19 +0000 (15:07 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 22 Jan 2011 13:07:19 +0000 (15:07 +0200)
qcsrc/server/w_crylink.qc
qcsrc/server/w_fireball.qc
qcsrc/server/w_grenadelauncher.qc

index 604efbe1c1cd5ac3b0b83e5ae08b6ffa3786c6b8..7e463f56b664c4d5bc36813b202796ca0c7e459b 100644 (file)
@@ -700,6 +700,10 @@ float w_crylink(float req)
                else
                        return self.ammo_cells >= autocvar_g_balance_crylink_secondary_ammo;
        }
+       else if (req == WR_RELOAD)
+       {
+               W_Crylink_Reload();
+       }
        return TRUE;
 };
 #endif
@@ -741,10 +745,6 @@ float w_crylink(float req)
                else
                        w_deathtypestring = "%s took a close look at %s's Crylink"; // unchecked: SECONDARY
        }
-       else if (req == WR_RELOAD)
-       {
-               W_Crylink_Reload();
-       }
        return TRUE;
 }
 #endif
index e0f0748f4725b29b6153334bf4ecc71a1a74f8f6..91c104fba9e5885133925594cdaaf67d4134703d 100644 (file)
@@ -467,6 +467,10 @@ float w_fireball(float req)
        {
                self.fireball_primarytime = time;
        }
+       else if (req == WR_RELOAD)
+       {
+               W_Fireball_Reload();
+       }
        return TRUE;
 };
 #endif
@@ -523,10 +527,6 @@ float w_fireball(float req)
                                w_deathtypestring = "%s tasted %s's fireball";
                }
        }
-       else if (req == WR_RELOAD)
-       {
-               W_Fireball_Reload();
-       }
        return TRUE;
 }
 #endif
index ddd5eacf499e4b5c4b071eccc9ae217565302c83..d01194b0bde43044a9ee1c8f00baa1d040cc9703 100644 (file)
@@ -435,6 +435,10 @@ float w_glauncher(float req)
                else
                        return self.ammo_rockets >= autocvar_g_balance_grenadelauncher_secondary_ammo;
        }
+       else if (req == WR_RELOAD)
+       {
+               W_GrenadeLauncher_Reload();
+       }
        return TRUE;
 };
 #endif
@@ -470,10 +474,6 @@ float w_glauncher(float req)
                else // unchecked: SECONDARY, BOUNCE
                        w_deathtypestring = "%s ate %s's grenade";
        }
-       else if (req == WR_RELOAD)
-       {
-               W_GrenadeLauncher_Reload();
-       }
        return TRUE;
 }
 #endif