Merge branch 'master' into divVerent/4team_ctf

[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 61e2e536453840c283a1fb026906f781e7567b8b..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 // (SERVER) called when monster dies
-#define MR_PRECACHE       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);
@@ -32,7 +31,7 @@ const float MON_FLAG_MELEE = 1024;
 #define M_NAME(monstertype) (get_monsterinfo(monstertype)).monster_name
 
 // =====================
-//  Monster Registration
+//     Monster Registration
 // =====================
 
 float m_null(float dummy);
@@ -62,21 +61,7 @@ float MON_LAST;
        REGISTER_MONSTER_2(MON_##id,func,monsterflags,min_s,max_s,modelname,shortname,mname)
 #endif
 
-#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
-
 #include "all.qh"
 
-#undef MON_ADD_CVAR
 #undef REGISTER_MONSTER
-ACCUMULATE_FUNCTION(RegisterMonsters, register_monsters_done)
+ACCUMULATE_FUNCTION(RegisterMonsters, register_monsters_done);