r82 - trunk/basezym/progsqc

[DONOTREPLY at icculus.org]

Author: Vermeulen
Date: 2007-11-14 17:49:05 -0500 (Wed, 14 Nov 2007)
New Revision: 82

Modified:
   trunk/basezym/progsqc/damage.qc
   trunk/basezym/progsqc/player.qc
Log:
Enemies now die correctly

Modified: trunk/basezym/progsqc/damage.qc
===================================================================
--- trunk/basezym/progsqc/damage.qc	2007-11-14 03:48:37 UTC (rev 81)
+++ trunk/basezym/progsqc/damage.qc	2007-11-14 22:49:05 UTC (rev 82)
@@ -521,7 +521,7 @@
 	}
 	if (self.lefty & PROJECTILEFLAG_REMOTEDETONATE)
 	{
-	    if (self.realowner.button3)
+	    if (self.realowner.button4)
 		{
 		   self.th_die();
 		}

Modified: trunk/basezym/progsqc/player.qc
===================================================================
--- trunk/basezym/progsqc/player.qc	2007-11-14 03:48:37 UTC (rev 81)
+++ trunk/basezym/progsqc/player.qc	2007-11-14 22:49:05 UTC (rev 82)
@@ -956,6 +956,7 @@
 	else if (animtype == ANIMTYPE_RUNLEFT    ) anim_start(self, self.playerclass.actoranim_LEGS_RUN , animtype, player_selectlegsanim);
 	else if (animtype == ANIMTYPE_RUNRIGHT   ) anim_start(self, self.playerclass.actoranim_LEGS_RUN , animtype, player_selectlegsanim);
 	else if (animtype == ANIMTYPE_FALL       ) anim_start(self, self.playerclass.actoranim_LEGS_JUMP, animtype, anim_nullfunc);
+	//else if (animtype == ANIMTYPE_DYING      ) anim_start(self, self.playerclass.actoranim_LEGS_JUMP, animtype, anim_nullfunc);
 };
 
 void(float force) player_selectlegsanim =
@@ -982,6 +983,10 @@
 	}
 	if (!(self.flags & FL_ONGROUND))
 		animtype = ANIMTYPE_FALL;
+	if (self.deadflag & DEAD_DYING)
+		animtype = ANIMTYPE_DYING;
+	if (self.deadflag & DEAD_DEAD)
+	    animtype = ANIMTYPE_DEAD;
 	player_legsanim(animtype, force);
 };