Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_5.cpp	Wed Jun 12 15:13:45 2013 +0200
+++ b/mm7_5.cpp	Thu Jun 13 00:53:51 2013 +0400
@@ -15,7 +15,8 @@
 #include "Keyboard.h"
 #include "GammaControl.h"
 #include "stru11.h"
-
+#include "mm7_data.h"
+#include "FactionTable.h"
 #include "Vis.h"
 #include "mm7.h"
 #include "Game.h"
@@ -6885,7 +6886,8 @@
           v20 = 0;
         }
         if (PID_TYPE(v22) == OBJECT_Actor)
-          v10 = (unsigned __int8)*(&byte_5C8D1A[89 * (pMonsterStats->pInfos[pActors[PID_ID(v22)].pMonsterInfo.uID].uID - 1) / 3] + (v5->pMonsterInfo.uID - 1) / 3);
+          //v10 = (unsigned __int8)*(&byte_5C8D1A[89 * (pMonsterStats->pInfos[pActors[PID_ID(v22)].pMonsterInfo.uID].uID - 1) / 3] + (v5->pMonsterInfo.uID - 1) / 3);
+          v10 = pFactionTable->relations[(pMonsterStats->pInfos[pActors[PID_ID(v22)].pMonsterInfo.uID].uID) / 3 + 1][(v5->pMonsterInfo.uID - 1) / 3 + 1];
         else
           v10 = 4;
         if ( v10 == 1 )