X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fanimdecide.qc;h=136e4d436669695d88000651798fac34834a8cf8;hb=bb92926e2ce245957e28e9fc78b6250eb9c082f5;hp=76921d662db3d9e3c7407a757efe417455945fbc;hpb=10c0be8573ea4ab40c24c4a4267f445e00b63857;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc
index 76921d662..136e4d436 100644
--- a/qcsrc/common/animdecide.qc
+++ b/qcsrc/common/animdecide.qc
@@ -1,22 +1,20 @@
 #include "animdecide.qh"
 
-#include <common/monsters/all.qh>
+#include <common/monsters/_mod.qh>
 
 #if defined(SVQC)
     #include "util.qh"
-    #include "../server/defs.qh"
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
 #endif
 
 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; }
 
@@ -213,9 +211,8 @@ vector animdecide_getloweranim(entity e)
 				return vec3(e.anim_duckwalkbackright.x, t, ANIMPRIO_CROUCH);
 			case ANIMIMPLICITSTATE_BACKWARDS | ANIMIMPLICITSTATE_LEFT:
 				return vec3(e.anim_duckwalkbackleft.x, t, ANIMPRIO_CROUCH);
-			default:
-				return vec3(e.anim_duckidle.x, t, ANIMPRIO_CROUCH);
 		}
+		return vec3(e.anim_duckidle.x, t, ANIMPRIO_CROUCH);
 	}
 	else
 	{
@@ -239,12 +236,11 @@ vector animdecide_getloweranim(entity e)
 				return vec3(e.anim_backright.x, t, ANIMPRIO_ACTIVE);
 			case ANIMIMPLICITSTATE_BACKWARDS | ANIMIMPLICITSTATE_LEFT:
 				return vec3(e.anim_backleft.x, t, ANIMPRIO_ACTIVE);
-			default:
-				return vec3(e.anim_idle.x, t, ANIMPRIO_IDLE);
 		}
+		return vec3(e.anim_idle.x, t, ANIMPRIO_IDLE);
 	}
 	// can't get here
-	return vec3(e.anim_idle.x, t, ANIMPRIO_IDLE);
+	//return vec3(e.anim_idle.x, t, ANIMPRIO_IDLE);
 }
 
 void animdecide_setimplicitstate(entity e, float onground)