Clean up MENUQC #includes

[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 9cc7211b43f7f2ed9972e55f3fde0d7a3c67916e..096c2e5ea43a864874c37b9ce437215f8ae95e88 100644 (file)
--- a/qcsrc/common/monsters/monsters.qc
+++ b/qcsrc/common/monsters/monsters.qc
@@ -1,10 +1,12 @@
+#include "monsters.qh"
+
 #include "all.qh"
 
 // MONSTER PLUGIN SYSTEM
 entity monster_info[MON_MAXCOUNT];
 entity dummy_monster_info;
 
-void register_monster(float id, float(float) func, float monsterflags, 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();
@@ -18,10 +20,6 @@ void register_monster(float id, float(float) func, float monsterflags, vector mi
        e.mins = min_s;
        e.maxs = max_s;
        e.model = strzone(strcat("models/monsters/", modelname));
-       
-       #ifndef MENUQC
-       func(MR_INIT);
-       #endif
 }
 float m_null(float dummy) { return 0; }
 void register_monsters_done()
@@ -37,7 +35,7 @@ void register_monsters_done()
        dummy_monster_info.maxs = '0 0 0';
        dummy_monster_info.model = "";
 }
-entity get_monsterinfo(float id)
+entity get_monsterinfo(int id)
 {
        entity m;
        if(id < MON_FIRST || id > MON_LAST)
@@ -46,4 +44,4 @@ entity get_monsterinfo(float id)
        if(m)
                return m;
        return dummy_monster_info;
-}
\ No newline at end of file
+}