Merge branch 'master' into TimePath/unified_weapons

[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 fe6078303cb5cacd1b488e0bccb38d0b8f6e6490..937c83c9edbe868b7f2f3c25f5d3d4caaab628cf 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -1,20 +1,31 @@
+#ifndef SHAMBLER_H
+#define SHAMBLER_H
+
 #ifndef MENUQC
-bool M_Shambler(int);
+MODEL(MON_SHAMBLER, "models/monsters/shambler.mdl");
 #endif
-REGISTER_MONSTER_SIMPLE(
-/* MON_##id   */ 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")
-) {
+
+CLASS(Shambler, Monster)
+    ATTRIB(Shambler, spawnflags, int, MONSTER_SIZE_BROKEN | MON_FLAG_SUPERMONSTER | MON_FLAG_MELEE | MON_FLAG_RANGED);
+    ATTRIB(Shambler, mins, vector, '-41 -41 -31');
+    ATTRIB(Shambler, maxs, vector, '41 41 65');
 #ifndef MENUQC
-       this.monster_func = M_Shambler;
-       this.monster_func(MR_PRECACHE);
+    ATTRIB(Shambler, m_model, Model, MDL_MON_SHAMBLER);
+#endif
+    ATTRIB(Shambler, netname, string, "shambler");
+    ATTRIB(Shambler, monster_name, string, _("Shambler"));
+ENDCLASS(Shambler)
+
+REGISTER_MONSTER(SHAMBLER, NEW(Shambler)) {
+#ifndef MENUQC
+    this.mr_precache(this);
 #endif
 }
 
+#endif
+
+#ifdef IMPLEMENTATION
+
 #ifdef SVQC
 float autocvar_g_monster_shambler_health;
 float autocvar_g_monster_shambler_damageforcescale = 0.1;
@@ -168,7 +179,7 @@ void M_Shambler_Attack_Lightning()
        CSQCProjectile(gren, true, PROJECTILE_SHAMBLER_LIGHTNING, true);
 }
 
-float M_Shambler_Attack(float attack_type)
+float M_Shambler_Attack(float attack_type, entity targ)
 {SELFPARAM();
        switch(attack_type)
        {
@@ -214,30 +225,29 @@ float M_Shambler_Attack(float attack_type)
 spawnfunc(monster_shambler) { Monster_Spawn(MON_SHAMBLER.monsterid); }
 #endif // SVQC
 
-bool M_Shambler(int req)
-{SELFPARAM();
-       switch(req)
-       {
                #ifdef SVQC
-               case MR_THINK:
+               METHOD(Shambler, mr_think, bool(Shambler thismon))
                {
                        return true;
                }
-               case MR_PAIN:
+               METHOD(Shambler, mr_pain, bool(Shambler thismon))
                {
+                       SELFPARAM();
                        self.pain_finished = time + 0.5;
                        setanim(self, self.anim_pain1, true, true, false);
                        return true;
                }
-               case MR_DEATH:
+               METHOD(Shambler, mr_death, bool(Shambler thismon))
                {
+                       SELFPARAM();
                        setanim(self, self.anim_die1, false, true, true);
                        return true;
                }
                #endif
                #ifndef MENUQC
-               case MR_ANIM:
+               METHOD(Shambler, mr_anim, bool(Shambler thismon))
                {
+                       SELFPARAM();
                        vector none = '0 0 0';
                        self.anim_die1 = animfixfps(self, '8 1 0.5', none); // 2 seconds
                        self.anim_walk = animfixfps(self, '1 1 1', none);
@@ -253,8 +263,9 @@ bool M_Shambler(int req)
                }
                #endif
                #ifdef SVQC
-               case MR_SETUP:
+               METHOD(Shambler, mr_setup, bool(Shambler thismon))
                {
+                       SELFPARAM();
                        if(!self.health) self.health = (autocvar_g_monster_shambler_health);
                        if(!self.attack_range) self.attack_range = 150;
                        if(!self.speed) { self.speed = (autocvar_g_monster_shambler_speed_walk); }
@@ -272,12 +283,10 @@ bool M_Shambler(int req)
 
                        return true;
                }
-               case MR_PRECACHE:
+               METHOD(Shambler, mr_precache, bool(Shambler thismon))
                {
                        return true;
                }
                #endif
-       }
 
-       return true;
-}
+#endif