Mercurial > mm7

comparison Actor.cpp @ 1956:542c13cd72e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[12] to pActorBuffs[ACTOR_BUFF_ENSLAVED]
author Grumpy7
date Fri, 25 Oct 2013 11:17:25 -0700
parents 0c5326e2044a
children 3d0c57c4fa83
comparison
equal deleted inserted replaced
1955:0c5326e2044a 1956:542c13cd72e2
2464 } 2464 }
2465 2465
2466 if (can_target_party && !pParty->Invisible()) 2466 if (can_target_party && !pParty->Invisible())
2467 { 2467 {
2468 if ( thisActor->uAttributes & 0x80000 2468 if ( thisActor->uAttributes & 0x80000
2469 && thisActor->pActorBuffs[12].uExpireTime <= 0 2469 && thisActor->pActorBuffs[ACTOR_BUFF_ENSLAVED].uExpireTime <= 0
2470 && thisActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime <= 0 2470 && thisActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime <= 0
2471 && thisActor->pActorBuffs[ACTOR_BUFF_SUMMONED].uExpireTime <= 0 ) 2471 && thisActor->pActorBuffs[ACTOR_BUFF_SUMMONED].uExpireTime <= 0 )
2472 v14 = 4; 2472 v14 = 4;
2473 else 2473 else
2474 v14 = thisActor->GetActorsRelation(0); 2474 v14 = thisActor->GetActorsRelation(0);