Mercurial > mm7

comparison mm7_5.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 "Mouse.h" 14 #include "Mouse.h"
15 #include "Keyboard.h" 15 #include "Keyboard.h"
16 #include "GammaControl.h" 16 #include "GammaControl.h"
17 #include "stru11.h" 17 #include "stru11.h"
18 18 #include "mm7_data.h"
19 #include "FactionTable.h"
19 #include "Vis.h" 20 #include "Vis.h"
20 #include "mm7.h" 21 #include "mm7.h"
21 #include "Game.h" 22 #include "Game.h"
22 #include "GUIWindow.h" 23 #include "GUIWindow.h"
23 #include "GUIFont.h" 24 #include "GUIFont.h"
6883 { 6884 {
6884 v9 = 0; 6885 v9 = 0;
6885 v20 = 0; 6886 v20 = 0;
6886 } 6887 }
6887 if (PID_TYPE(v22) == OBJECT_Actor) 6888 if (PID_TYPE(v22) == OBJECT_Actor)
6888 v10 = (unsigned __int8)*(&byte_5C8D1A[89 * (pMonsterStats->pInfos[pActors[PID_ID(v22)].pMonsterInfo.uID].uID - 1) / 3] + (v5->pMonsterInfo.uID - 1) / 3); 6889 //v10 = (unsigned __int8)*(&byte_5C8D1A[89 * (pMonsterStats->pInfos[pActors[PID_ID(v22)].pMonsterInfo.uID].uID - 1) / 3] + (v5->pMonsterInfo.uID - 1) / 3);
6890 v10 = pFactionTable->relations[(pMonsterStats->pInfos[pActors[PID_ID(v22)].pMonsterInfo.uID].uID) / 3 + 1][(v5->pMonsterInfo.uID - 1) / 3 + 1];
6889 else 6891 else
6890 v10 = 4; 6892 v10 = 4;
6891 if ( v10 == 1 ) 6893 if ( v10 == 1 )
6892 { 6894 {
6893 if ( (double)(signed int)v20 < 307.2 ) 6895 if ( (double)(signed int)v20 < 307.2 )