X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fall.qh;h=f32470b58467b1613c3a0cff82bd765c5496ab91;hb=a3797be83f371bdcf32a6fbacdaba950fb5408a8;hp=ce02312f1d4a414a11014c618b32cf5816df0320;hpb=0ae1f40f1237c4888d08cc716287a277f4472d9f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/monsters/all.qh b/qcsrc/common/monsters/all.qh
index ce02312f1..f32470b58 100644
--- a/qcsrc/common/monsters/all.qh
+++ b/qcsrc/common/monsters/all.qh
@@ -1,73 +1,28 @@
 #ifndef MONSTERS_ALL_H
 #define MONSTERS_ALL_H
 
-#include "../util.qh"
+#include "monster.qh"
 
-// monster requests
-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
+string M_Model(string m_mdl);
 
-// functions:
-entity get_monsterinfo(float id);
-
-// special spawn flags
-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_...
-.string netname; // short name
-.string monster_name; // human readable name
-.float(float) monster_func; // m_...
-.string mdl; // currently a copy of the model
-.string model; // full name of model
-.int spawnflags;
-.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
-// =====================
-
-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 int MON_MAXCOUNT = 24;
+REGISTRY(Monsters, BITS(5))
+REGISTER_REGISTRY(RegisterMonsters)
 const int MON_FIRST = 1;
-int MON_COUNT;
-int MON_LAST;
+#define MON_LAST (Monsters_COUNT - 1)
+/** If you register a new monster, make sure to add it to all.inc */
+#define REGISTER_MONSTER(id, inst) REGISTER(RegisterMonsters, MON, Monsters, id, monsterid, inst)
 
-#define REGISTER_MONSTER_2(id,func,monsterflags,min_s,max_s,modelname,shortname,mname) \
-	int id; \
-	float func(float); \
-	void RegisterMonsters_##id() \
-	{ \
-		MON_LAST = (id = MON_FIRST + MON_COUNT); \
-		++MON_COUNT; \
-		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)
-#endif
+REGISTER_MONSTER(Null, NEW(Monster));
+
+Monster get_monsterinfo(int id)
+{
+	if (id >= MON_FIRST && id <= MON_LAST) {
+		Monster m = Monsters[id];
+		if (m) return m;
+	}
+	return MON_Null;
+}
 
 #include "all.inc"
 
-#undef REGISTER_MONSTER
-ACCUMULATE_FUNCTION(RegisterMonsters, register_monsters_done);
 #endif