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 2b15e4085734183ebe31053e327314d6bfc5f8e1..a262a234505008acf2d80c49b0617bd947695ce2 100644 (file)
--- a/qcsrc/common/monsters/all.qc
+++ b/qcsrc/common/monsters/all.qc
@@ -1,3 +1,4 @@
+#include "all.qh"
 #ifndef MONSTERS_ALL_C
 #define MONSTERS_ALL_C
 
@@ -6,7 +7,7 @@ string M_Model(string m_mdl)
        string output = strcat("models/monsters/", m_mdl);
 #ifdef SVQC
        MUTATOR_CALLHOOK(MonsterModel, m_mdl, output);
-       return monster_model_output;
+       return M_ARGV(1, string);
 #else
        return output;
 #endif
@@ -15,7 +16,7 @@ string M_Model(string m_mdl)
 #include "all.qh"
 
 #define IMPLEMENTATION
-#include "all.inc"
+#include "monster/_mod.inc"
 #undef IMPLEMENTATION
 
 #ifdef SVQC