Mercurial > mm7

changeset 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 4ecc099ef876
children 140ca8123384 50d00b884765
files Actor.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Tue Oct 22 21:31:24 2013 +0100
+++ b/Actor.cpp	Tue Oct 22 18:55:37 2013 -0700
@@ -2978,7 +2978,7 @@
 				pActor->uActorHeight = pMonsterList->pMonsters[pActor->pMonsterInfo.uID - 1].uMonsterHeight;
 			if (pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime > 0)
 				pActor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
-			else
+			else if (pActor->pActorBuffs[ACTOR_BUFF_CHARM].uExpireTime < 0)
 				pActor->pMonsterInfo.uHostilityType = pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uHostilityType;
 			
 			if (pActor->pActorBuffs[ACTOR_BUFF_PARALYZED].uExpireTime > 0 ||