More animations and animation tweaks

[voretournament/voretournament.git] / data / qcsrc / server / cl_player.qc

diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index f8e16cd4efb52d2de3fc164daafb3fe605724615..829a6501b777bf234d15110d7ad8a240b123fef3 100644 (file)
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -311,9 +311,9 @@ void player_anim (void)
        if (!self.animstate_override)\r
        {\r
                if(self.swallow_progress_pred)\r
-                       setanim(self, self.anim_duckjump, FALSE, TRUE, FALSE); // looks good for predators who are swallowing\r
+                       setanim(self, self.anim_duckjump, TRUE, FALSE, FALSE); // looks good for predators who are swallowing\r
                else if(self.swallow_progress_prey)\r
-                       setanim(self, self.anim_die2, FALSE, TRUE, FALSE); // looks good for prey who's getting swallowed\r
+                       setanim(self, self.anim_die2, FALSE, FALSE, FALSE); // looks good for prey who's getting swallowed\r
                else if(self.stat_eaten)\r
                {\r
                        if(self.BUTTON_ATCK || self.predator.digesting)\r
@@ -363,7 +363,16 @@ void player_anim (void)
 \r
        if (self.weaponentity)\r
        if (!self.weaponentity.animstate_override)\r
-               setanim(self.weaponentity, self.weaponentity.anim_idle, TRUE, FALSE, FALSE);\r
+       {\r
+               if(self.swallow_progress_pred)\r
+                       setanim(self.weaponentity, self.weaponentity.anim_fire2, TRUE, FALSE, FALSE); // looks good for predators who are swallowing\r
+               else if(self.swallow_progress_prey)\r
+                       setanim(self.weaponentity, self.weaponentity.anim_reload, TRUE, FALSE, FALSE); // looks good for prey who's getting swallowed\r
+               else if(self.stat_eaten && self.BUTTON_ATCK)\r
+                       setanim(self.weaponentity, self.weaponentity.anim_fire1, TRUE, FALSE, FALSE); // looks good for prey attacking the stomach\r
+               else\r
+                       setanim(self.weaponentity, self.weaponentity.anim_idle, TRUE, FALSE, FALSE);\r
+       }\r
 }\r
 \r
 void SpawnThrownWeapon (vector org, float w, float doreduce)\r