s/WEP_(ID)/WEP_$1.m_id/

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

diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc
index 12ff5dc891de1be28de7d0e1e083bca4f4cd5337..85a5fb0e7de14a0b4c5efaab6503ddd2a28bd0bf 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -1,15 +1,19 @@
-#ifdef REGISTER_MONSTER
-REGISTER_MONSTER(
+#ifndef MENUQC
+bool m_shambler(int);
+#endif
+REGISTER_MONSTER_SIMPLE(
 /* MON_##id   */ SHAMBLER,
-/* function   */ m_shambler,
 /* spawnflags */ MONSTER_SIZE_BROKEN | MON_FLAG_SUPERMONSTER | MON_FLAG_MELEE | MON_FLAG_RANGED,
 /* mins,maxs  */ '-41 -41 -31', '41 41 65',
 /* model      */ "shambler.mdl",
 /* netname    */ "shambler",
 /* fullname   */ _("Shambler")
-);
+) {
+#ifndef MENUQC
+       this.monster_func = m_shambler;
+#endif
+}
 
-#else
 #ifdef SVQC
 float autocvar_g_monster_shambler_health;
 float autocvar_g_monster_shambler_attack_smash_damage;
@@ -86,7 +90,7 @@ void shambler_lightning_explode()
        self.nextthink = time + 0.2;
 }
 
-void shambler_lightning_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void shambler_lightning_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {
        if (self.health <= 0)
                return;
@@ -197,7 +201,7 @@ void spawnfunc_monster_shambler()
 {
        self.classname = "monster_shambler";
 
-       if(!monster_initialize(MON_SHAMBLER)) { remove(self); return; }
+       if(!monster_initialize(MON_SHAMBLER.monsterid)) { remove(self); return; }
 }
 
 float m_shambler(float req)
@@ -222,7 +226,7 @@ float m_shambler(float req)
                        self.monster_loot = spawnfunc_item_health_mega;
                        self.monster_attackfunc = shambler_attack;
                        self.frame = shambler_anim_stand;
-                       self.weapon = WEP_VORTEX;
+                       self.weapon = WEP_VORTEX.m_id;
 
                        return true;
                }
@@ -252,4 +256,3 @@ float m_shambler(float req)
 }
 
 #endif // CSQC
-#endif // REGISTER_MONSTER