]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
compile fix
authorRudolf Polzer <divverent@alientrap.org>
Fri, 20 Jan 2012 21:13:26 +0000 (22:13 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 20 Jan 2012 21:13:26 +0000 (22:13 +0100)
qcsrc/server/w_fireball.qc

index 4f119c32691097f716d37ca65f60006663dad010..77c67b46bb9f96e548731ad022d702ae1f005fdd 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(FIREBALL, w_fireball, 0, 9, WEP_FLAG_RELOADABLE | WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "fireball", "fireball", _("Fireball"));
+REGISTER_WEAPON(FIREBALL, w_fireball, 0, 9, WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "fireball", "fireball", _("Fireball"));
 #else
 #ifdef SVQC
 .float bot_primary_fireballmooth; // whatever a mooth is
@@ -326,9 +326,7 @@ float w_fireball(float req)
        }
        else if (req == WR_THINK)
        {
-               if(autocvar_g_balance_fireball_reload_ammo && self.clip_load < min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo)) // forced reload
-                       weapon_action(self.weapon, WR_RELOAD);
-               else if (self.BUTTON_ATCK)
+               if (self.BUTTON_ATCK)
                {
                        if (time >= self.fireball_primarytime)
                        if (weapon_prepareattack(0, autocvar_g_balance_fireball_primary_refire))