Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monsters.qh

diff --git a/qcsrc/common/monsters/monsters.qh b/qcsrc/common/monsters/monsters.qh
index 962a810bc2fc5882c9dec3fa4412da7ecefcb70f..c355e12a75a31b197fadd75476db33290f270564 100644 (file)
--- a/qcsrc/common/monsters/monsters.qh
+++ b/qcsrc/common/monsters/monsters.qh
@@ -1,9 +1,8 @@
 // monster requests
-#define MR_SETUP          1 // (SERVER) setup monster data
+#define MR_SETUP                 1 // (SERVER) setup monster data
 #define MR_THINK                 2 // (SERVER) logic to run every frame
-#define MR_DEATH          3 // (BOTH) called when monster dies
-#define MR_INIT           4 // (BOTH) precaches models/sounds used by this monster
-#define MR_CONFIG         5 // (ALL)
+#define MR_DEATH                 3 // (SERVER) called when monster dies
+#define MR_PRECACHE              4 // (BOTH) precaches models/sounds used by this monster
 
 // functions:
 entity get_monsterinfo(float id);
@@ -25,27 +24,14 @@ const float MON_FLAG_MELEE = 1024;
 .string mdl; // currently a copy of the model
 .string model; // full name of model
 .float spawnflags;
-
-// csqc linking
-#ifndef MENUQC
-.float anim_start_time;
-
-float MSF_UPDATE               = 2;
-float MSF_STATUS               = 4;
-float MSF_SETUP                        = 8;
-float MSF_ANG                  = 16;
-float MSF_MOVE                 = 32;
-float MSF_ANIM                 = 64;
-
-float MSF_FULL_UPDATE  = 16777215;
-#endif
+.vector mins, maxs; // monster hitbox size
 
 // other useful macros
 #define MON_ACTION(monstertype,mrequest) (get_monsterinfo(monstertype)).monster_func(mrequest)
 #define M_NAME(monstertype) (get_monsterinfo(monstertype)).monster_name
 
 // =====================
-//  Monster Registration
+//     Monster Registration
 // =====================
 
 float m_null(float dummy);
@@ -67,24 +53,15 @@ float MON_LAST;
                register_monster(id,func,monsterflags,min_s,max_s,modelname,shortname,mname); \
        } \
        ACCUMULATE_FUNCTION(RegisterMonsters, RegisterMonsters_##id)
+#ifdef MENUQC
+#define REGISTER_MONSTER(id,func,monsterflags,min_s,max_s,modelname,shortname,mname) \
+       REGISTER_MONSTER_2(MON_##id,m_null,monsterflags,min_s,max_s,modelname,shortname,mname)
+#else
 #define REGISTER_MONSTER(id,func,monsterflags,min_s,max_s,modelname,shortname,mname) \
        REGISTER_MONSTER_2(MON_##id,func,monsterflags,min_s,max_s,modelname,shortname,mname)
-
-#define MON_DUPECHECK(dupecheck,cvar) \
-       #ifndef dupecheck \
-               #define dupecheck \
-               float cvar; \
-       #else \
-               #error DUPLICATE MONSTER CVAR: cvar \
-       #endif
-
-#define MON_ADD_CVAR(monster,name) \
-               MON_DUPECHECK(MON_CVAR_##monster##_##name, autocvar_g_monster_##monster##_##name)
-
-#define MON_CVAR(monster,name) autocvar_g_monster_##monster##_##name
+#endif
 
 #include "all.qh"
 
-#undef MON_ADD_CVAR
 #undef REGISTER_MONSTER
-ACCUMULATE_FUNCTION(RegisterMonsters, register_monsters_done)
+ACCUMULATE_FUNCTION(RegisterMonsters, register_monsters_done);