X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_invasion.qc;h=5209b225f1084629f085a6cf65b9cc0b86ef7a22;hb=a8cc9eb71b0d0e44e9a968a9cf5554f6226cc838;hp=412e7bd5405caa28832a5edc54ad8dcd4f01c652;hpb=1c758278958da8f2baf1f39cd0f298d5bda097a2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_invasion.qc b/qcsrc/server/mutators/gamemode_invasion.qc
index 412e7bd54..5209b225f 100644
--- a/qcsrc/server/mutators/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/gamemode_invasion.qc
@@ -6,15 +6,17 @@
 #include "../../common/monsters/spawn.qh"
 #include "../../common/monsters/sv_monsters.qh"
 
-void spawnfunc_invasion_spawnpoint()
-{SELFPARAM();
+spawnfunc(invasion_spawnpoint)
+{
 	if(!g_invasion) { remove(self); return; }
 
 	self.classname = "invasion_spawnpoint";
 
 	if(autocvar_g_invasion_zombies_only) // precache only if it hasn't been already
-	if(self.monsterid)
-		MON_ACTION(self.monsterid, MR_PRECACHE);
+	if(self.monsterid) {
+		Monster mon = get_monsterinfo(self.monsterid);
+		mon.mr_precache(mon);
+	}
 }
 
 float invasion_PickMonster(float supermonster_count)
@@ -430,9 +432,10 @@ void invasion_DelayedInit() // Do this check with a delay so we can wait for tea
 
 void invasion_Initialize()
 {
-	if(autocvar_g_invasion_zombies_only)
-		MON_ACTION(MON_ZOMBIE.monsterid, MR_PRECACHE);
-	else
+	if(autocvar_g_invasion_zombies_only) {
+		Monster mon = MON_ZOMBIE;
+		mon.mr_precache(mon);
+	} else
 	{
 		float i;
 		entity mon;
@@ -442,7 +445,7 @@ void invasion_Initialize()
 			if((mon.spawnflags & MONSTER_TYPE_FLY) || (mon.spawnflags & MONSTER_TYPE_SWIM))
 				continue; // flying/swimming monsters not yet supported
 
-			MON_ACTION(i, MR_PRECACHE);
+			mon.mr_precache(mon);
 		}
 	}