Mercurial > mm7

comparison Actor.cpp @ 1947:33f3103b062b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pActorBuffs[1] to pActorBuffs[ACTOR_BUFF_CHARM]
author Grumpy7
date Fri, 25 Oct 2013 11:09:52 -0700
parents aa3ca49a10f5
children 7fd4bfa175fd
comparison
equal deleted inserted replaced
1946:aa3ca49a10f5 1947:33f3103b062b
1971 if ( v4->pMonsterInfo.uHostilityType != 4 ) 1971 if ( v4->pMonsterInfo.uHostilityType != 4 )
1972 { 1972 {
1973 v4->uAttributes &= 0xFFFFFFFBu; 1973 v4->uAttributes &= 0xFFFFFFFBu;
1974 v4->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long; 1974 v4->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
1975 } 1975 }
1976 if ( v4->pActorBuffs[1].uExpireTime > 0 ) 1976 if ( v4->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0 )
1977 v4->pActorBuffs[1].Reset(); 1977 v4->pActorBuffs[ACTOR_BUFF_CHARM].Reset();
1978 if ( v4->pActorBuffs[4].uExpireTime > 0 ) 1978 if ( v4->pActorBuffs[4].uExpireTime > 0 )
1979 v4->pActorBuffs[4].Reset(); 1979 v4->pActorBuffs[4].Reset();
1980 if ( stunRegardlessOfState 1980 if ( stunRegardlessOfState
1981 || (v4->uAIState != Stunned 1981 || (v4->uAIState != Stunned
1982 && v4->uAIState != AttackingRanged1 1982 && v4->uAIState != AttackingRanged1
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[12].uExpireTime <= 0
2470 && thisActor->pActorBuffs[1].uExpireTime <= 0 2470 && thisActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime <= 0
2471 && thisActor->pActorBuffs[2].uExpireTime <= 0 ) 2471 && thisActor->pActorBuffs[2].uExpireTime <= 0 )
2472 v14 = 4; 2472 v14 = 4;
2473 else 2473 else
2474 v14 = thisActor->GetActorsRelation(0); 2474 v14 = thisActor->GetActorsRelation(0);
2475 if ( v14 != 0 ) 2475 if ( v14 != 0 )