Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_3.cpp	Wed Jun 12 15:13:45 2013 +0200
+++ b/mm7_3.cpp	Thu Jun 13 00:53:51 2013 +0400
@@ -15,7 +15,7 @@
 #include "Mouse.h"
 #include "Keyboard.h"
 #include "stru6.h"
-
+#include "FactionTable.h"
 #include "MapInfo.h"
 #include "Game.h"
 #include "GUIWindow.h"
@@ -14790,8 +14790,9 @@
 				if ( target_pid_type == OBJECT_Actor )
 				{
 					v36 = v75.uDistance;
-					v37 = (unsigned __int8)*(&byte_5C8D1A[89 * (pActor->pMonsterInfo.uID - 1) / 3]
-						+ (pActors[PID_ID(target_pid)].pMonsterInfo.uID - 1) / 3);
+					//v37 = (unsigned __int8)*(&byte_5C8D1A[89 * (pActor->pMonsterInfo.uID - 1) / 3]
+					//	+ (pActors[PID_ID(target_pid)].pMonsterInfo.uID - 1) / 3);
+                    v37 =pFactionTable->relations[(pActor->pMonsterInfo.uID-1) / 3 + 1][(pActors[PID_ID(target_pid)].pMonsterInfo.uID - 1) / 3 + 1];
 				}
 				else
 				{