[nexuiz-commits] r7364 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-06 09:40:30 -0400 (Thu, 06 Aug 2009)
New Revision: 7364

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
Log:
r7363 | div0 | 2009-08-06 09:37:54 -0400 (Thu, 06 Aug 2009) | 2 lines
use the taunt animation for "cmd voice taunt"


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-08-06 13:37:54 UTC (rev 7363)
+++ branches/nexuiz-2.0/.patchsets	2009-08-06 13:40:30 UTC (rev 7364)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7361
+revisions_applied = 1-7363

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc	2009-08-06 13:37:54 UTC (rev 7363)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc	2009-08-06 13:40:30 UTC (rev 7364)
@@ -145,7 +145,7 @@
 	self.anim_pain1 = '9 1 2'; // 0.5 seconds
 	self.anim_pain2 = '10 1 2'; // 0.5 seconds
 	self.anim_shoot = '11 1 5'; // TODO: analyze models and set framerate
-	self.anim_taunt = '12 1 1'; // FIXME?  there is no code using this anim
+	self.anim_taunt = '12 1 0.33'; // FIXME?  there is no code using this anim
 	self.anim_run = '13 1 1';
 	self.anim_runbackwards = '14 1 1';
 	self.anim_strafeleft = '15 1 1';
@@ -1193,6 +1193,9 @@
 				}
 			break;
 		case VOICETYPE_TAUNT:
+			if(self.classname == "player")
+				if(self.deadflag == DEAD_NO)
+					setanim(self, self.anim_taunt, FALSE, TRUE, TRUE);
 			FOR_EACH_REALCLIENT(msg_entity)
 			{
 				if (msg_entity.cvar_cl_voice_directional >= 1)