From: terencehill <piuntn@gmail.com>
Date: Sun, 14 Dec 2014 15:13:51 +0000 (+0100)
Subject: Fix missing initialization of warmup_start_ammo_plasma; also apply the same order... 
X-Git-Tag: xonotic-v0.8.0~80^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff0eef119edca9a5a82b80e979d1c887e95cf209;p=xonotic%2Fxonotic-data.pk3dir.git

Fix missing initialization of warmup_start_ammo_plasma; also apply the same order to start ammo variable initializations
---

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 33010d174..3a12eb8c5 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -797,11 +797,11 @@ void readplayerstartcvars()
 
 	if(start_items & IT_UNLIMITED_WEAPON_AMMO)
 	{
-		start_ammo_rockets = 999;
 		start_ammo_shells = 999;
+		start_ammo_nails = 999;
+		start_ammo_rockets = 999;
 		start_ammo_cells = 999;
 		start_ammo_plasma = 999;
-		start_ammo_nails = 999;
 		start_ammo_fuel = 999;
 	}
 	else
@@ -820,6 +820,7 @@ void readplayerstartcvars()
 		warmup_start_ammo_nails = start_ammo_nails;
 		warmup_start_ammo_rockets = start_ammo_rockets;
 		warmup_start_ammo_cells = start_ammo_cells;
+		warmup_start_ammo_plasma = start_ammo_plasma;
 		warmup_start_ammo_fuel = start_ammo_fuel;
 		warmup_start_health = start_health;
 		warmup_start_armorvalue = start_armorvalue;
@@ -830,9 +831,10 @@ void readplayerstartcvars()
 		if (!g_weaponarena && !g_ca)
 		{
 			warmup_start_ammo_shells = cvar("g_warmup_start_ammo_shells");
-			warmup_start_ammo_cells = cvar("g_warmup_start_ammo_cells");
 			warmup_start_ammo_nails = cvar("g_warmup_start_ammo_nails");
 			warmup_start_ammo_rockets = cvar("g_warmup_start_ammo_rockets");
+			warmup_start_ammo_cells = cvar("g_warmup_start_ammo_cells");
+			warmup_start_ammo_plasma = cvar("g_warmup_start_ammo_plasma");
 			warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
 			warmup_start_health = cvar("g_warmup_start_health");
 			warmup_start_armorvalue = cvar("g_warmup_start_armor");
@@ -878,16 +880,16 @@ void readplayerstartcvars()
 
 	start_ammo_shells = max(0, start_ammo_shells);
 	start_ammo_nails = max(0, start_ammo_nails);
+	start_ammo_rockets = max(0, start_ammo_rockets);
 	start_ammo_cells = max(0, start_ammo_cells);
 	start_ammo_plasma = max(0, start_ammo_plasma);
-	start_ammo_rockets = max(0, start_ammo_rockets);
 	start_ammo_fuel = max(0, start_ammo_fuel);
 
 	warmup_start_ammo_shells = max(0, warmup_start_ammo_shells);
 	warmup_start_ammo_nails = max(0, warmup_start_ammo_nails);
+	warmup_start_ammo_rockets = max(0, warmup_start_ammo_rockets);
 	warmup_start_ammo_cells = max(0, warmup_start_ammo_cells);
 	warmup_start_ammo_plasma = max(0, warmup_start_ammo_plasma);
-	warmup_start_ammo_rockets = max(0, warmup_start_ammo_rockets);
 	warmup_start_ammo_fuel = max(0, warmup_start_ammo_fuel);
 }