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 8b5320336fdc710784022fc3c27f197ae1a4d03d..ae994ae1b24a1dcf02fdcb7128f0c75147d04f63 100644 (file)
--- a/qcsrc/common/monsters/monsters.qh
+++ b/qcsrc/common/monsters/monsters.qh
@@ -13,6 +13,7 @@ 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_...
@@ -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)