Mercurial > mm7

comparison Actor.cpp @ 1918:c77935190b51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixing monsters not attacking unless attacked
author Grumpy7
date Tue, 22 Oct 2013 18:55:37 -0700
parents 3f0b9ffd788c
children 50d00b884765
comparison
equal deleted inserted replaced
1917:4ecc099ef876 1918:c77935190b51
2976 } 2976 }
2977 if (pActor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime < 0) 2977 if (pActor->pActorBuffs[ACTOR_BUFF_SHRINK].uExpireTime < 0)
2978 pActor->uActorHeight = pMonsterList->pMonsters[pActor->pMonsterInfo.uID - 1].uMonsterHeight; 2978 pActor->uActorHeight = pMonsterList->pMonsters[pActor->pMonsterInfo.uID - 1].uMonsterHeight;
2979 if (pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0) 2979 if (pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0)
2980 pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly; 2980 pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
2981 else 2981 else if (pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime < 0)
2982 pActor->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uHostilityType; 2982 pActor->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uHostilityType;
2983 2983
2984 if (pActor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0 || 2984 if (pActor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0 ||
2985 pActor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0) 2985 pActor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime > 0)
2986 continue; 2986 continue;