Merge remote-tracking branch 'origin/TimePath/experiments/csqc_prediction' into TimeP...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monsters.qc

diff --git a/qcsrc/common/monsters/monsters.qc b/qcsrc/common/monsters/monsters.qc
index 706bf552651e97cf71286f1162c78ffe830c0406..096c2e5ea43a864874c37b9ce437215f8ae95e88 100644 (file)
--- a/qcsrc/common/monsters/monsters.qc
+++ b/qcsrc/common/monsters/monsters.qc
@@ -1,8 +1,4 @@
-#ifdef SVQC
-#include "lib/defs.qh"
-#include "lib/monsters.qc"
-#include "lib/spawn.qc"
-#endif
+#include "monsters.qh"
 
 #include "all.qh"
 
@@ -10,7 +6,7 @@
 entity monster_info[MON_MAXCOUNT];
 entity dummy_monster_info;
 
-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(int id, float(float) func, int monsterflags, vector min_s, vector max_s, string modelname, string shortname, string mname)
 {
        entity e;
        monster_info[id - 1] = e = spawn();
@@ -20,12 +16,10 @@ void register_monster(float id, float(float) func, float monstertype, vector min
        e.monster_name = mname;
        e.monster_func = func;
        e.mdl = modelname;
+       e.spawnflags = monsterflags;
        e.mins = min_s;
        e.maxs = max_s;
        e.model = strzone(strcat("models/monsters/", modelname));
-       e.spawnflags = monstertype;
-       
-       func(MR_INIT);
 }
 float m_null(float dummy) { return 0; }
 void register_monsters_done()
@@ -40,9 +34,8 @@ void register_monsters_done()
        dummy_monster_info.mins = '-0 -0 -0';
        dummy_monster_info.maxs = '0 0 0';
        dummy_monster_info.model = "";
-       dummy_monster_info.spawnflags = 0;
 }
-entity get_monsterinfo(float id)
+entity get_monsterinfo(int id)
 {
        entity m;
        if(id < MON_FIRST || id > MON_LAST)