X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fanimdecide.qc;h=f759ef44475dcd387dc2e46a60ae1ba8498d4d9f;hb=52a9c292d13ebe409521e61be89dcb4eebe1114e;hp=ab389278d16fcd696d850af106c59947b4108da6;hpb=df2fe9b28cb6210b671bec6d5ae834ff4eb2e2db;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc
index ab389278d..f759ef444 100644
--- a/qcsrc/common/animdecide.qc
+++ b/qcsrc/common/animdecide.qc
@@ -1,10 +1,13 @@
 #include "animdecide.qh"
 
-#include <common/monsters/all.qh>
-
-#if defined(SVQC)
-    #include "util.qh"
-    #include "../server/defs.qh"
+#if defined(CSQC)
+	#include <common/monsters/_mod.qh>
+#elif defined(MENUQC)
+#elif defined(SVQC)
+	#include <common/monsters/_mod.qh>
+	#include <common/stats.qh>
+	#include <common/util.qh>
+	#include <common/weapons/_all.qh>
 #endif
 
 bool monsters_animoverride(entity this)
@@ -210,9 +213,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
 	{
@@ -236,12 +238,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)