Mercurial > mm7

changeset 864:0b4fc79351b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* decompiler error float compare * Hostility_Friendly initialization
author zipi
date Sun, 31 Mar 2013 18:31:37 +0100
parents b7b67485ec43
children 883221c72cf1
files Outdoor.cpp mm7_3.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Outdoor.cpp	Sun Mar 31 17:40:31 2013 +0100
+++ b/Outdoor.cpp	Sun Mar 31 18:31:37 2013 +0100
@@ -2797,7 +2797,7 @@
               pActors[i].vVelocity.y = 0;
               pActors[i].vVelocity.z = 0;
               pActors[i].UpdateAnimation();
-              pActors[i].pMonsterInfo.uHostilityType = (MonsterInfo::HostilityRadius)0;
+			  pActors[i].pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
               pActors[i].PrepareSprites(0);
               }
           else
@@ -2825,7 +2825,7 @@
           pActors[i].vVelocity.y = 0;
           pActors[i].vVelocity.z = 0;
           pActors[i].UpdateAnimation();
-          pActors[i].pMonsterInfo.uHostilityType = (MonsterInfo::HostilityRadius)0;
+		  pActors[i].pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
           pActors[i].PrepareSprites(0);
           }
       else 
--- a/mm7_3.cpp	Sun Mar 31 17:40:31 2013 +0100
+++ b/mm7_3.cpp	Sun Mar 31 18:31:37 2013 +0100
@@ -15767,7 +15767,7 @@
 			else if ( (signed int)v21->pMonsterInfo.uRecoveryTime > 0 )
 			{
 				v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
-				if ( !(v54 | v55) || v21->pMonsterInfo.uMovementType == 5 )
+				if ( v80 * 307.2 > (double)v81 || v21->pMonsterInfo.uMovementType == 5 )
 				{
 					v64 = (signed __int64)v47;
 					Actor::AI_Stand(actor_id, target_pid, v64, &pDir);