From: terencehill <piuntn@gmail.com>
Date: Sun, 14 Dec 2014 14:41:32 +0000 (+0100)
Subject: Correctly initialize start ammo in instagib
X-Git-Tag: xonotic-v0.8.0~80^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9b420d307be87962ddf3eb3cc2ca40202093aae1;p=xonotic%2Fxonotic-data.pk3dir.git

Correctly initialize start ammo in instagib
---

diff --git a/qcsrc/server/mutators/mutator_instagib.qc b/qcsrc/server/mutators/mutator_instagib.qc
index 34208d314..cd0ebdd0f 100644
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@ -289,12 +289,17 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerDamage)
 
 MUTATOR_HOOKFUNCTION(instagib_SetStartItems)
 {
-	start_ammo_cells = cvar("g_instagib_ammo_start");
+	start_health       = warmup_start_health       = 100;
+	start_armorvalue   = warmup_start_armorvalue   = 0;
 
-	start_health = 100;
-	start_armorvalue = 0;
-	start_weapons = WEPSET_VAPORIZER;
-	warmup_start_weapons = WEPSET_VAPORIZER;
+	start_ammo_shells  = warmup_start_ammo_shells  = 0;
+	start_ammo_nails   = warmup_start_ammo_nails   = 0;
+	start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_instagib_ammo_start");
+	start_ammo_plasma  = warmup_start_ammo_plasma  = 0;
+	start_ammo_rockets = warmup_start_ammo_rockets = 0;
+	start_ammo_fuel    = warmup_start_ammo_fuel    = 0;
+
+	start_weapons = warmup_start_weapons = WEPSET_VAPORIZER;
 	start_items |= IT_UNLIMITED_SUPERWEAPONS;
 
 	return FALSE;