From: Rudolf Polzer Date: Fri, 20 Jan 2012 21:13:26 +0000 (+0100) Subject: compile fix X-Git-Tag: xonotic-v0.6.0~104^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2bfb6b72fb874846575ed824b9163d867b3312b5;p=xonotic%2Fxonotic-data.pk3dir.git compile fix --- diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc index 4f119c326..77c67b46b 100644 --- a/qcsrc/server/w_fireball.qc +++ b/qcsrc/server/w_fireball.qc @@ -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))