From: terencehill <piuntn@gmail.com>
Date: Sun, 19 Oct 2014 16:14:04 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/ca_fixes
X-Git-Tag: xonotic-v0.8.0~126^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49e5f5d2c7423c3c4536a57e6740d79d9b8eec94;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/ca_fixes
---

49e5f5d2c7423c3c4536a57e6740d79d9b8eec94
diff --cc qcsrc/server/mutators/gamemode_invasion.qc
index 56df8c1e3,8448a215e..364cb7fe3
--- a/qcsrc/server/mutators/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/gamemode_invasion.qc
@@@ -295,7 -416,31 +416,29 @@@ void invasion_DelayedInit() // Do this 
  	round_handler_Spawn(Invasion_CheckPlayers, Invasion_CheckWinner, Invasion_RoundStart);
  	round_handler_Init(5, autocvar_g_invasion_warmup, autocvar_g_invasion_round_timelimit);
  
 -	allowed_to_spawn = TRUE;
 -
  	inv_roundcnt = 0;
+ 	inv_maxrounds = 15; // 15?
+ }
+ 
+ void invasion_Initialize()
+ {
+ 	if(autocvar_g_invasion_zombies_only)
+ 		MON_ACTION(MON_ZOMBIE, MR_PRECACHE);
+ 	else
+ 	{
+ 		float i;
+ 		entity mon;
+ 		for(i = MON_FIRST; i <= MON_LAST; ++i)
+ 		{
+ 			mon = get_monsterinfo(i);
+ 			if((mon.spawnflags & MONSTER_TYPE_FLY) || (mon.spawnflags & MONSTER_TYPE_SWIM))
+ 				continue; // flying/swimming monsters not yet supported
+ 
+ 			MON_ACTION(i, MR_PRECACHE);
+ 		}
+ 	}
+ 	
+ 	InitializeEntity(world, invasion_DelayedInit, INITPRIO_GAMETYPE);
  }
  
  MUTATOR_DEFINITION(gamemode_invasion)