Merge branch 'master' into terencehill/bot_ai

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

diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc
index 76921d662db3d9e3c7407a757efe417455945fbc..b53a9ba0e9cbf6123d7438736785e8206200358a 100644 (file)
--- a/qcsrc/common/animdecide.qc
+++ b/qcsrc/common/animdecide.qc
@@ -1,6 +1,6 @@
 #include "animdecide.qh"
 
-#include <common/monsters/all.qh>
+#include <common/monsters/_mod.qh>
 
 #if defined(SVQC)
     #include "util.qh"
@@ -10,13 +10,10 @@
 bool monsters_animoverride(entity this)
 {
        Monster monster_id = NULL;
-       FOREACH(Monsters, it != MON_Null, LAMBDA(
-               if(it.model == this.model)
-               {
-                       monster_id = it;
-                       break;
-               }
-       ));
+       FOREACH(Monsters, it != MON_Null && it.m_model.model_str() == this.model, {
+        monster_id = it;
+        break;
+       });
 
        if(!monster_id) { return false; }