Revert "Merge branch 'TimePath/bot_api' into 'master'\r"

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monster / zombie.qc

diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc
index cca02dd9e2e2b567b3a852b61ccedc06c5c6ec61..8425a123add60d29469b219c2d0f3b191a34b7de 100644 (file)
--- a/qcsrc/common/monsters/monster/zombie.qc
+++ b/qcsrc/common/monsters/monster/zombie.qc
@@ -18,7 +18,7 @@ ENDCLASS(Zombie)
 
 REGISTER_MONSTER(ZOMBIE, NEW(Zombie)) {
 #ifndef MENUQC
 
 REGISTER_MONSTER(ZOMBIE, NEW(Zombie)) {
 #ifndef MENUQC

-    MON_ACTION(this, MR_PRECACHE);
+    this.mr_precache(this);

 #endif
 }
 
 #endif
 }
 


@@ -118,7 +118,7 @@ float M_Zombie_Defend_Block()
        return true;
 }
 
        return true;
 }
 

-float M_Zombie_Attack(float attack_type)
+float M_Zombie_Attack(float attack_type, entity targ)

 {SELFPARAM();
        switch(attack_type)
        {
 {SELFPARAM();
        switch(attack_type)
        {


@@ -149,7 +149,7 @@ float M_Zombie_Attack(float attack_type)
        return false;
 }
 
        return false;
 }
 

-void spawnfunc_monster_zombie() { Monster_Spawn(MON_ZOMBIE.monsterid); }
+spawnfunc(monster_zombie) { Monster_Spawn(MON_ZOMBIE.monsterid); }

 #endif // SVQC
 
                #ifdef SVQC
 #endif // SVQC
 
                #ifdef SVQC