From: Mario <mario.mario@y7mail.com>
Date: Thu, 6 Jun 2013 18:04:43 +0000 (+1000)
Subject: Add warmup support to melee only arena
X-Git-Tag: xonotic-v0.8.0~366^2~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7781ee1e0be7fb26f14bc6a9bcd05c385e820a00;p=xonotic%2Fxonotic-data.pk3dir.git

Add warmup support to melee only arena
---

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 5a5a91136..ea7360835 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -969,7 +969,7 @@ void readlevelcvars(void)
 	g_warmup_allguns = cvar("g_warmup_allguns");
 	g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");
 
-	if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign") || cvar("g_melee_only"))
+	if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign"))
 		inWarmupStage = 0; // these modes cannot work together, sorry
 
 	g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");
diff --git a/qcsrc/server/mutators/mutator_melee_only.qc b/qcsrc/server/mutators/mutator_melee_only.qc
index 85354bf4d..639bba507 100644
--- a/qcsrc/server/mutators/mutator_melee_only.qc
+++ b/qcsrc/server/mutators/mutator_melee_only.qc
@@ -1,8 +1,10 @@
 MUTATOR_HOOKFUNCTION(melee_SetStartItems)
 {
 	start_ammo_shells = 0;
+	warmup_start_ammo_shells = 0;
 	
 	WEPSET_COPY_AW(start_weapons, WEP_SHOTGUN);
+	WEPSET_COPY_AW(warmup_start_weapons, WEP_SHOTGUN);
 		
 	return FALSE;
 }