Mercurial > mm7

diff Actor.cpp @ 308:6d584c95dcf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Wed, 20 Feb 2013 00:28:52 +0400
parents 72faa54ff319 cc8e4dc397ec
children 5a66be213cff
line wrap: on
line diff
--- a/Actor.cpp	Wed Feb 20 00:26:17 2013 +0400
+++ b/Actor.cpp	Wed Feb 20 00:28:52 2013 +0400
@@ -3216,7 +3216,7 @@
   v3 = 60 * v1->pSpriteIDs[5];
   v1->uCurrentActionTime = 0;
   v1->uAIState = Dying;
-  v1->uCurrentActionAnimation = 5;
+  v1->uCurrentActionAnimation = ANIM_Dying;
   LOWORD(v3) = *(__int16 *)((char *)&v2->uAnimLength + v3);
   v1->sCurrentHP = 0;
   v1->uCurrentActionLength = 8 * v3;
@@ -4168,7 +4168,7 @@
   this->uActorRadius = 32;
   this->uActorHeight = 128;
   this->uAIState = Standing;
-  this->uCurrentActionAnimation = 0;
+  this->uCurrentActionAnimation = ANIM_Standing;
   this->uMovementSpeed = 200;
   this->uCarriedItemID = 0;
   this->uGroup = 0;