Merge branch 'master' into Mario/monsters

[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 5124e4528e3c9066f7fa5bdb7a6851ba1ed5f1ef..ae994ae1b24a1dcf02fdcb7128f0c75147d04f63 100644 (file)
--- a/qcsrc/common/monsters/monsters.qh
+++ b/qcsrc/common/monsters/monsters.qh
@@ -8,6 +8,13 @@
 // functions:
 entity get_monsterinfo(float id);
 
+// special spawn flags
+const float MONSTER_RESPAWN_DEATHPOINT = 128; // re-spawn where we died
+const float MONSTER_TYPE_FLY = 256;
+const float MONSTER_TYPE_SWIM = 512;
+const float MONSTER_SIZE_BROKEN = 1024; // TODO: remove when bad models are replaced
+const float MON_FLAG_SUPERMONSTER = 2048; // incredibly powerful monster
+
 // entity properties of monsterinfo:
 .float monsterid; // MON_...
 .string netname; // short name
@@ -26,32 +33,26 @@ entity get_monsterinfo(float id);
 // =====================
 
 float m_null(float dummy);
-void register_monster(float id, float(float) func, float monstertype, vector min_s, vector max_s, string modelname, string shortname, string mname);
+void register_monster(float id, float(float) func, float monsterflags, vector min_s, vector max_s, string modelname, string shortname, string mname);
 void register_monsters_done();
 
-// special spawn flags
-const float MONSTER_RESPAWN_DEATHPOINT = 699; // re-spawn where we died
-const float MONSTER_TYPE_FLY = 700;
-const float MONSTER_TYPE_SWIM = 701;
-const float MONSTER_SIZE_BROKEN = 702; // TODO: remove when bad models are replaced
-
 const float MON_MAXCOUNT = 24;
 #define MON_FIRST 1
 float MON_COUNT;
 float MON_LAST;
 
-#define REGISTER_MONSTER_2(id,func,monstertype,min_s,max_s,modelname,shortname,mname) \
+#define REGISTER_MONSTER_2(id,func,monsterflags,min_s,max_s,modelname,shortname,mname) \
        float id; \
        float func(float); \
        void RegisterMonsters_##id() \
        { \
                MON_LAST = (id = MON_FIRST + MON_COUNT); \
                ++MON_COUNT; \
-               register_monster(id,func,monstertype,min_s,max_s,modelname,shortname,mname); \
+               register_monster(id,func,monsterflags,min_s,max_s,modelname,shortname,mname); \
        } \
        ACCUMULATE_FUNCTION(RegisterMonsters, RegisterMonsters_##id)
-#define REGISTER_MONSTER(id,func,monstertype,min_s,max_s,modelname,shortname,mname) \
-       REGISTER_MONSTER_2(MON_##id,func,monstertype,min_s,max_s,modelname,shortname,mname)
+#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 \
@@ -64,24 +65,10 @@ float MON_LAST;
 #define MON_ADD_CVAR(monster,name) \
                MON_DUPECHECK(MON_CVAR_##monster##_##name, autocvar_g_monster_##monster##_##name)
 
-#define MON_CVAR(monster,name) autocvar_g_balance_##monster##_##name
-
-#define MON_ADD_PROP(monster,prop,name) \
-       .float ##prop; \
-       MON_DUPECHECK(MON_CVAR_##monster##_##name, autocvar_g_monster_##monster##_##name)
-
-#define MON_SET_PROP(wepid,monster,prop,name) get_monsterinfo(##wepid).##prop = autocvar_g_monster_##monster##_##name;
-
-#define MON_SET_PROPS(monsettings,wepid) \
-       #define MON_ADD_CVAR(monster,mode,name) \
-       #define MON_ADD_PROP(monster,prop,name) MON_SET_PROP(wepid,monster,prop,name) \
-       monsettings \
-       #undef MON_ADD_CVAR \
-       #undef MON_ADD_PROP
+#define MON_CVAR(monster,name) autocvar_g_monster_##monster##_##name
 
 #include "all.qh"
 
 #undef MON_ADD_CVAR
-#undef MON_ADD_PROP
 #undef REGISTER_MONSTER
 ACCUMULATE_FUNCTION(RegisterMonsters, register_monsters_done)