Merge branch 'master' into martin-t/bullet-trails

[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 e17a90a7cb1469818166a4f4ef5dac1ce69b3f92..9dc09ca394b47166bc4d717901d0aa17f6465664 100644 (file)
--- a/qcsrc/common/monsters/all.qc
+++ b/qcsrc/common/monsters/all.qc
@@ -1,27 +1,12 @@
-#ifndef MONSTERS_ALL_C
-#define MONSTERS_ALL_C
 #include "all.qh"
 
-REGISTER_MONSTER(Null, Monster) {
-       this.netname = "";
-       this.monster_name = "Monster";
-       this.monster_func = m_null;
-       this.mdl = "";
-       this.mins = '-0 -0 -0';
-       this.maxs = '0 0 0';
-       this.model = "";
-}
-
-#include "all.inc"
-
-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
+}