Mercurial > mm7

comparison Actor.cpp @ 1946:aa3ca49a10f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[6] to pActorBuffs[ACTOR_BUFF_PARALYZED]
author Grumpy7
date Fri, 25 Oct 2013 11:08:34 -0700
parents 431d3da6e945
children 33f3103b062b
comparison
equal deleted inserted replaced
1945:431d3da6e945 1946:aa3ca49a10f5
153 bool isparalyzed; // esi@1 153 bool isparalyzed; // esi@1
154 bool isstoned; // edi@2 154 bool isstoned; // edi@2
155 AIState v3; // ax@6 155 AIState v3; // ax@6
156 156
157 isstoned = (signed __int64)this->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0;// stoned 157 isstoned = (signed __int64)this->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0;// stoned
158 isparalyzed = (signed __int64)this->pActorBuffs[6].uExpireTime > 0;// paralyzed 158 isparalyzed = (signed __int64)this->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0;// paralyzed
159 v3 = this->uAIState; 159 v3 = this->uAIState;
160 return !(isstoned || isparalyzed || v3 == Dying || v3 == Dead || v3 == Removed || v3 == Summoned || v3 == Disabled); 160 return !(isstoned || isparalyzed || v3 == Dying || v3 == Dead || v3 == Removed || v3 == Summoned || v3 == Disabled);
161 } 161 }
162 162
163 //----- (004089C7) -------------------------------------------------------- 163 //----- (004089C7) --------------------------------------------------------
2056 actor->uCurrentActionTime = 0; 2056 actor->uCurrentActionTime = 0;
2057 actor->uAIState = Dying; 2057 actor->uAIState = Dying;
2058 actor->uCurrentActionAnimation = ANIM_Dying; 2058 actor->uCurrentActionAnimation = ANIM_Dying;
2059 actor->sCurrentHP = 0; 2059 actor->sCurrentHP = 0;
2060 actor->uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[actor->pSpriteIDs[ANIM_Dying]].uAnimLength; 2060 actor->uCurrentActionLength = 8 * pSpriteFrameTable->pSpriteSFrames[actor->pSpriteIDs[ANIM_Dying]].uAnimLength;
2061 actor->pActorBuffs[6].Reset(); 2061 actor->pActorBuffs[ACTOR_BUFF_PARALYZED].Reset();
2062 actor->pActorBuffs[ACTOR_BUFF_STONED].Reset(); 2062 actor->pActorBuffs[ACTOR_BUFF_STONED].Reset();
2063 Actor::PlaySound(uActorID, 1); 2063 Actor::PlaySound(uActorID, 1);
2064 actor->UpdateAnimation(); 2064 actor->UpdateAnimation();
2065 2065
2066 for (uint i = 0; i < 5; ++i) 2066 for (uint i = 0; i < 5; ++i)
3064 { 3064 {
3065 pActor->uAIState = Removed; 3065 pActor->uAIState = Removed;
3066 continue; 3066 continue;
3067 } 3067 }
3068 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0 3068 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0
3069 || (signed __int64)pActor->pActorBuffs[6].uExpireTime > 0) 3069 || (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0)
3070 { 3070 {
3071 continue; 3071 continue;
3072 } 3072 }
3073 v27 = pMiscTimer->uTimeElapsed; 3073 v27 = pMiscTimer->uTimeElapsed;
3074 v28 = pActor->pMonsterInfo.uRecoveryTime; 3074 v28 = pActor->pMonsterInfo.uRecoveryTime;