Mercurial > mm7

comparison TurnEngine.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 8509a59af88f
comparison
equal deleted inserted replaced
1945:431d3da6e945 1946:aa3ca49a10f5
964 for (i=0; i<uActorQueueSize; ++i ) 964 for (i=0; i<uActorQueueSize; ++i )
965 { 965 {
966 if (PID_TYPE(pQueue[i].uPackedID) == OBJECT_Actor) 966 if (PID_TYPE(pQueue[i].uPackedID) == OBJECT_Actor)
967 { 967 {
968 v6 = &pActors[PID_ID(pQueue[i].uPackedID)]; 968 v6 = &pActors[PID_ID(pQueue[i].uPackedID)];
969 if ( !(v6->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0|| (v6->pActorBuffs[6].uExpireTime > 0) || 969 if ( !(v6->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0|| (v6->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0) ||
970 v6->uAIState == AIState::Dead || v6->uAIState == AIState::Removed || v6->uAIState == AIState::Disabled) ) 970 v6->uAIState == AIState::Dead || v6->uAIState == AIState::Removed || v6->uAIState == AIState::Disabled) )
971 { 971 {
972 v13 = ai_near_actors_targets_pid[PID_ID(pQueue[i].uPackedID)]; 972 v13 = ai_near_actors_targets_pid[PID_ID(pQueue[i].uPackedID)];
973 Actor::GetDirectionInfo(pQueue[i].uPackedID, v13, &v9, 0); 973 Actor::GetDirectionInfo(pQueue[i].uPackedID, v13, &v9, 0);
974 if ( v6->uAIState == AIState::Pursuing || v6->uAIState == AIState::Tethered ) 974 if ( v6->uAIState == AIState::Pursuing || v6->uAIState == AIState::Tethered )