Merge branch 'master' into Mario/weaponarena_available

[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 ce0a9023d494e2cf14367532c5305f9ec4d7af37..9dc09ca394b47166bc4d717901d0aa17f6465664 100644 (file)
--- a/qcsrc/common/monsters/all.qc
+++ b/qcsrc/common/monsters/all.qc
@@ -1,26 +1,12 @@
-#ifndef MONSTERS_ALL_C
-#define MONSTERS_ALL_C
+#include "all.qh"
 
 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
 }
-
-#include "all.qh"
-
-#define IMPLEMENTATION
-#include "monster/_mod.inc"
-#undef IMPLEMENTATION
-
-#ifdef SVQC
-#include "spawn.qc"
-#include "sv_monsters.qc"
-#endif
-
-#endif