X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonsters.qh;h=4aa1f7ef4c0625e6d007c6da9e7a0b97dee9445f;hb=79f8e8d5cfdd67d25f574bebec19d0a6f31eb20a;hp=e9a942b45790470f67dc690dd2e48e90d25c1950;hpb=410ff5f6cc4f7d5d8282ba9d93fe6a65d1c74489;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/monsters/monsters.qh b/qcsrc/common/monsters/monsters.qh
index e9a942b45..4aa1f7ef4 100644
--- a/qcsrc/common/monsters/monsters.qh
+++ b/qcsrc/common/monsters/monsters.qh
@@ -1,21 +1,25 @@
+#ifndef MONSTERS_H
+#define MONSTERS_H
+
+#include "../util.qh"
+
 // monster requests
-#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)
+const int MR_SETUP = 1; // (SERVER) setup monster data
+const int MR_THINK = 2; // (SERVER) logic to run every frame
+const int MR_DEATH = 3; // (SERVER) called when monster dies
+const int MR_PRECACHE = 4; // (BOTH) precaches models/sounds used by this monster
 
 // functions:
 entity get_monsterinfo(float id);
 
 // special spawn flags
-const float MONSTER_RESPAWN_DEATHPOINT = 16; // re-spawn where we died
-const float MONSTER_TYPE_FLY = 32;
-const float MONSTER_TYPE_SWIM = 64;
-const float MONSTER_SIZE_BROKEN = 128; // TODO: remove when bad models are replaced
-const float MON_FLAG_SUPERMONSTER = 256; // incredibly powerful monster
-const float MON_FLAG_RANGED = 512; // monster shoots projectiles
-const float MON_FLAG_MELEE = 1024;
+const int MONSTER_RESPAWN_DEATHPOINT = 16; // re-spawn where we died
+const int MONSTER_TYPE_FLY = 32;
+const int MONSTER_TYPE_SWIM = 64;
+const int MONSTER_SIZE_BROKEN = 128; // TODO: remove when bad models are replaced
+const int MON_FLAG_SUPERMONSTER = 256; // incredibly powerful monster
+const int MON_FLAG_RANGED = 512; // monster shoots projectiles
+const int MON_FLAG_MELEE = 1024;
 
 // entity properties of monsterinfo:
 .float monsterid; // MON_...
@@ -24,7 +28,7 @@ const float MON_FLAG_MELEE = 1024;
 .float(float) monster_func; // m_...
 .string mdl; // currently a copy of the model
 .string model; // full name of model
-.float spawnflags;
+.int spawnflags;
 .vector mins, maxs; // monster hitbox size
 
 // other useful macros
@@ -32,20 +36,20 @@ const float MON_FLAG_MELEE = 1024;
 #define M_NAME(monstertype) (get_monsterinfo(monstertype)).monster_name
 
 // =====================
-//  Monster Registration
+//	Monster Registration
 // =====================
 
 float m_null(float dummy);
 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();
 
-const float MON_MAXCOUNT = 24;
-#define MON_FIRST 1
-float MON_COUNT;
-float MON_LAST;
+const int MON_MAXCOUNT = 24;
+const int MON_FIRST = 1;
+int MON_COUNT;
+int MON_LAST;
 
 #define REGISTER_MONSTER_2(id,func,monsterflags,min_s,max_s,modelname,shortname,mname) \
-	float id; \
+	int id; \
 	float func(float); \
 	void RegisterMonsters_##id() \
 	{ \
@@ -62,21 +66,8 @@ 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)
+#include "all.inc"
 
-#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);
+#endif