Mercurial > mm7

diff Outdoor.cpp @ 872:2db21a810d48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Mon, 01 Apr 2013 13:39:39 +0200
parents 710cf848ad24 0b4fc79351b6
children 062788391c88
line wrap: on
line diff
--- a/Outdoor.cpp	Mon Apr 01 13:39:19 2013 +0200
+++ b/Outdoor.cpp	Mon Apr 01 13:39:39 2013 +0200
@@ -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