Merge branch 'master' into terencehill/ca_fixes
authorterencehill <piuntn@gmail.com>
Sun, 19 Oct 2014 16:14:04 +0000 (18:14 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 19 Oct 2014 16:14:04 +0000 (18:14 +0200)
1  2 
gamemodes.cfg
qcsrc/common/mapinfo.qh
qcsrc/common/notifications.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_invasion.qc

diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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)