From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 15 Jul 2011 00:28:20 +0000 (+0300)
Subject: More animations and animation tweaks
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=80e531b34bc8354b0eb9c55a94dbc41643dea27f;ds=sidebyside

More animations and animation tweaks
---

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