Mercurial > mm7

comparison mm7_3.cpp @ 1263:73269755dd89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arcomage renaming&cleaning
author Gloval
date Thu, 13 Jun 2013 00:53:51 +0400
parents b9747d9e9b4e
children 6bc88137a019
comparison
equal deleted inserted replaced
1261:cdee1d692a4a 1263:73269755dd89
13 #include "DecalBuilder.h" 13 #include "DecalBuilder.h"
14 #include "ParticleEngine.h" 14 #include "ParticleEngine.h"
15 #include "Mouse.h" 15 #include "Mouse.h"
16 #include "Keyboard.h" 16 #include "Keyboard.h"
17 #include "stru6.h" 17 #include "stru6.h"
18 18 #include "FactionTable.h"
19 #include "MapInfo.h" 19 #include "MapInfo.h"
20 #include "Game.h" 20 #include "Game.h"
21 #include "GUIWindow.h" 21 #include "GUIWindow.h"
22 #include "GUIFont.h" 22 #include "GUIFont.h"
23 #include "GUIProgressBar.h" 23 #include "GUIProgressBar.h"
14788 if ( pActor->pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Friendly) 14788 if ( pActor->pMonsterInfo.uHostilityType == MonsterInfo::Hostility_Friendly)
14789 { 14789 {
14790 if ( target_pid_type == OBJECT_Actor ) 14790 if ( target_pid_type == OBJECT_Actor )
14791 { 14791 {
14792 v36 = v75.uDistance; 14792 v36 = v75.uDistance;
14793 v37 = (unsigned __int8)*(&byte_5C8D1A[89 * (pActor->pMonsterInfo.uID - 1) / 3] 14793 //v37 = (unsigned __int8)*(&byte_5C8D1A[89 * (pActor->pMonsterInfo.uID - 1) / 3]
14794 + (pActors[PID_ID(target_pid)].pMonsterInfo.uID - 1) / 3); 14794 // + (pActors[PID_ID(target_pid)].pMonsterInfo.uID - 1) / 3);
14795 v37 =pFactionTable->relations[(pActor->pMonsterInfo.uID-1) / 3 + 1][(pActors[PID_ID(target_pid)].pMonsterInfo.uID - 1) / 3 + 1];
14795 } 14796 }
14796 else 14797 else
14797 { 14798 {
14798 v37 = 4; 14799 v37 = 4;
14799 } 14800 }