Mercurial > mm7

comparison mm7_3.cpp @ 1266:71ebff35c428

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Thu, 13 Jun 2013 07:23:54 +0200
parents 6bc88137a019
children 1803172dffd9 8a196c858180 24bc24b64ec2
comparison
equal deleted inserted replaced
1265:2b4c8cdd8db0 1266:71ebff35c428
14 #include "DecalBuilder.h" 14 #include "DecalBuilder.h"
15 #include "ParticleEngine.h" 15 #include "ParticleEngine.h"
16 #include "Mouse.h" 16 #include "Mouse.h"
17 #include "Keyboard.h" 17 #include "Keyboard.h"
18 #include "stru6.h" 18 #include "stru6.h"
19 19 #include "FactionTable.h"
20 #include "MapInfo.h" 20 #include "MapInfo.h"
21 #include "Game.h" 21 #include "Game.h"
22 #include "GUIWindow.h" 22 #include "GUIWindow.h"
23 #include "GUIFont.h" 23 #include "GUIFont.h"
24 #include "GUIProgressBar.h" 24 #include "GUIProgressBar.h"
14790 if ( pActor->pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Friendly) 14790 if ( pActor->pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Friendly)
14791 { 14791 {
14792 if ( target_pid_type == OBJECT_Actor ) 14792 if ( target_pid_type == OBJECT_Actor )
14793 { 14793 {
14794 v36 = v75.uDistance; 14794 v36 = v75.uDistance;
14795 v37 = (unsigned __int8)*(&byte_5C8D1A[89 * (pActor->pMonsterInfo.uID - 1) / 3] 14795 //v37 = (unsigned __int8)*(&byte_5C8D1A[89 * (pActor->pMonsterInfo.uID - 1) / 3]
14796 + (pActors[PID_ID(target_pid)].pMonsterInfo.uID - 1) / 3); 14796 // + (pActors[PID_ID(target_pid)].pMonsterInfo.uID - 1) / 3);
14797 v37 =pFactionTable->relations[(pActor->pMonsterInfo.uID-1) / 3 + 1][(pActors[PID_ID(target_pid)].pMonsterInfo.uID - 1) / 3 + 1];
14797 } 14798 }
14798 else 14799 else
14799 { 14800 {
14800 v37 = 4; 14801 v37 = 4;
14801 } 14802 }