Merge branch 'master' into terencehill/spectatee_status_update

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

diff --git a/qcsrc/common/monsters/all.qc b/qcsrc/common/monsters/all.qc
index 232441e57370613861292c8b5f0b5ca5f4c7b80e..a262a234505008acf2d80c49b0617bd947695ce2 100644 (file)
--- a/qcsrc/common/monsters/all.qc
+++ b/qcsrc/common/monsters/all.qc
@@ -1,19 +1,27 @@
+#include "all.qh"
 #ifndef MONSTERS_ALL_C
 #define MONSTERS_ALL_C
 
-#include "all.qh"
-
-entity get_monsterinfo(int id)
+string M_Model(string m_mdl)
 {
-       if (id >= MON_FIRST && id <= MON_LAST) {
-               entity m = monster_info[id];
-               if (m) return m;
-       }
-       return MON_Null;
+       string output = strcat("models/monsters/", m_mdl);
+#ifdef SVQC
+       MUTATOR_CALLHOOK(MonsterModel, m_mdl, output);
+       return M_ARGV(1, string);
+#else
+       return output;
+#endif
 }
 
+#include "all.qh"
+
 #define IMPLEMENTATION
-#include "all.inc"
+#include "monster/_mod.inc"
 #undef IMPLEMENTATION
 
+#ifdef SVQC
+#include "spawn.qc"
+#include "sv_monsters.qc"
+#endif
+
 #endif