X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_fireball.qc;h=3d1956de7862a61ecf964b9d74401b909cd1fa02;hb=389e78faadb6cec0f9f8d8b5e2f1cc14785cf30f;hp=98571d30d0ff1d911646cbda49b2458c765c7441;hpb=a38754d15897eba1b8cf34154de9188ccdf3d674;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 98571d30d..3d1956de7 100644
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -1,14 +1,11 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(FIREBALL, w_fireball, IT_FUEL, 9, WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "fireball", "fireball", _("Fireball"));
+REGISTER_WEAPON(FIREBALL, w_fireball, IT_FUEL, 9, WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "fireball", "fireball", _("Fireball"));
 #else
 #ifdef SVQC
 .float bot_primary_fireballmooth; // whatever a mooth is
 .vector fireball_impactvec;
 .float fireball_primarytime;
 
-// weapon load persistence, for weapons that support reloading
-.float fireball_load;
-
 void W_Fireball_SetAmmoCounter()
 {
 	// set clip_load to the weapon we have switched to, if the gun uses reloading
@@ -16,7 +13,7 @@ void W_Fireball_SetAmmoCounter()
 		self.clip_load = 0; // also keeps crosshair ammo from displaying
 	else
 	{
-		self.clip_load = self.fireball_load;
+		self.clip_load = self.weapon_load[WEP_FIREBALL];
 		self.clip_size = autocvar_g_balance_fireball_reload_ammo; // for the crosshair ammo display
 	}
 }
@@ -230,7 +227,7 @@ void W_Fireball_Attack1_Frame0()
 		if(autocvar_g_balance_fireball_reload_ammo)
 		{
 			self.clip_load -= autocvar_g_balance_fireball_primary_ammo;
-			self.fireball_load = self.clip_load;
+			self.weapon_load[WEP_FIREBALL] = self.clip_load;
 		}
 		else
 			self.ammo_fuel -= autocvar_g_balance_fireball_primary_ammo;
@@ -291,7 +288,7 @@ void W_Fireball_Attack2()
 		if(autocvar_g_balance_fireball_reload_ammo)
 		{
 			self.clip_load -= autocvar_g_balance_fireball_secondary_ammo;
-			self.fireball_load = self.clip_load;
+			self.weapon_load[WEP_FIREBALL] = self.clip_load;
 		}
 		else
 			self.ammo_fuel -= autocvar_g_balance_fireball_secondary_ammo;
@@ -415,21 +412,18 @@ float w_fireball(float req)
 	else if (req == WR_CHECKAMMO1)
 	{
 		ammo_amount = self.ammo_fuel >= autocvar_g_balance_fireball_primary_ammo;
-		ammo_amount += self.fireball_load >= autocvar_g_balance_fireball_primary_ammo;
+		ammo_amount += self.weapon_load[WEP_FIREBALL] >= autocvar_g_balance_fireball_primary_ammo;
 		return ammo_amount;
 	}
 	else if (req == WR_CHECKAMMO2)
 	{
 		ammo_amount = self.ammo_fuel >= autocvar_g_balance_fireball_secondary_ammo;
-		ammo_amount += self.fireball_load >= autocvar_g_balance_fireball_secondary_ammo;
+		ammo_amount += self.weapon_load[WEP_FIREBALL] >= autocvar_g_balance_fireball_secondary_ammo;
 		return ammo_amount;
 	}
 	else if (req == WR_RESETPLAYER)
 	{
 		self.fireball_primarytime = time;
-
-		// all weapons must be fully loaded when we spawn
-		self.fireball_load = autocvar_g_balance_fireball_reload_ammo;
 	}
 	else if (req == WR_RELOAD)
 	{