From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 11 Feb 2011 16:57:32 +0000 (+0200)
Subject: Set self.current_ammo in each weapon's WR_SETUP stage. That way, this float can be... 
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=61cb733c0ef5f26597bdddf530deece52992658c;p=xonotic%2Fxonotic-data.pk3dir.git

Set self.current_ammo in each weapon's WR_SETUP stage. That way, this float can be used for many things throughout the code, and is always updated. Not fully finished.
---

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 222c0f9fd..cea3c92fc 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1623,10 +1623,7 @@ void W_DecreaseAmmo(.float ammo_type, float ammo_use, float ammo_reload)
 			self.weapon_load[self.weapon] = self.clip_load;
 		}
 		else
-		{
-			self.current_ammo = ammo_type;
 			self.(self.current_ammo) -= ammo_use;
-		}
 	}
 }
 
@@ -1722,7 +1719,7 @@ void W_ReloadStart()
 
 void W_Reload(.float sent_ammo_player, float sent_ammo_min, float sent_ammo_amount, float sent_time, string sent_sound)
 {
-	self.current_ammo = sent_ammo_player;
+	//self.current_ammo = sent_ammo_player;
 	self.reload_ammo_min = sent_ammo_min;
 	self.reload_ammo_amount = sent_ammo_amount;
 	self.reload_time = sent_time;
diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index a663df0f8..410980775 100644
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -601,6 +601,7 @@ float w_crylink(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_CRYLINK);
+		self.current_ammo = ammo_cells;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 6fb410019..31686c821 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -494,6 +494,7 @@ float w_electro(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_ELECTRO);
+		self.current_ammo = ammo_cells;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index a269c6556..65b944ffe 100644
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -360,6 +360,7 @@ float w_fireball(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_FIREBALL);
+		self.current_ammo = ammo_fuel;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 5ea482a4c..a50f47d37 100644
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -336,6 +336,7 @@ float w_glauncher(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_GRENADE_LAUNCHER);
+		self.current_ammo = ammo_rockets;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index cb6fad003..7a6adffa9 100644
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -160,6 +160,7 @@ float w_hagar(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_HAGAR);
+		self.current_ammo = ammo_rockets;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index c1de434ed..1809ab177 100644
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -199,6 +199,7 @@ float w_hlac(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_HLAC);
+		self.current_ammo = ammo_cells;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index ebf7c24e5..c3a1768be 100644
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -228,6 +228,7 @@ float w_hook(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_HOOK);
+		self.current_ammo = ammo_fuel;
 		self.hook_state &~= HOOK_WAITING_FOR_RELEASE;
 	}
 	else if (req == WR_CHECKAMMO1)
diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index ad29d442a..9ba19f9d5 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -269,6 +269,7 @@ float w_laser(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_LASER);
+		self.current_ammo = zero_ammo;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 3c9aac6cc..b52493fd5 100644
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -416,6 +416,7 @@ float w_minelayer(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_MINE_LAYER);
+		self.current_ammo = ammo_rockets;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index a15a6b258..d5dd7d0f6 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -234,6 +234,7 @@ float w_minstanex(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_MINSTANEX);
+		self.current_ammo = ammo_cells;
 		self.minstanex_lasthit = 0;
 	}
 	else if (req == WR_CHECKAMMO1)
diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index e3f4659c9..670d8a3eb 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -220,6 +220,7 @@ float w_nex(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_NEX);
+		self.current_ammo = ammo_cells;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index 76b5a5072..503fdde31 100644
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -272,6 +272,7 @@ float w_porto(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_PORTO);
+		self.current_ammo = zero_ammo;
 	}
 	else if (req == WR_RESETPLAYER)
 	{
diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index c33e0e764..8e45a61da 100644
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -450,6 +450,7 @@ float w_rlauncher(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_ROCKET_LAUNCHER);
+		self.current_ammo = ammo_rockets;
 		self.rl_release = 1;
 	}
 	else if (req == WR_CHECKAMMO1)
diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index 3659a2ec4..cfe7df634 100644
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -451,6 +451,7 @@ float w_seeker(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_SEEKER);
+		self.current_ammo = ammo_rockets;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index f92a3d356..538e1de27 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -152,6 +152,7 @@ float w_shotgun(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_SHOTGUN);
+		self.current_ammo = ammo_shells;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index ec5743d0b..deeab0ad0 100644
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -180,6 +180,7 @@ float w_sniperrifle(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_SNIPERRIFLE);
+		self.current_ammo = ammo_nails;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 00c083956..9849c37db 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -238,6 +238,7 @@ float w_tuba(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_TUBA);
+		self.current_ammo = zero_ammo;
 	}
 	else if (req == WR_CHECKAMMO1)
 		return TRUE; // TODO use fuel?