diff mm7_2.cpp @ 102:8a10c9780e17

Слияние
author Ritor1
date Fri, 08 Feb 2013 16:00:04 +0600
parents 2fb33d31ca0d 81e93310f73c
children aa9b34eb3da4
line wrap: on
line diff
--- a/mm7_2.cpp	Fri Feb 08 15:59:32 2013 +0600
+++ b/mm7_2.cpp	Fri Feb 08 16:00:04 2013 +0600
@@ -10096,10 +10096,10 @@
   int v7; // esi@9
   signed int v8; // [sp+4h] [bp-Ch]@3
   signed int v9; // [sp+8h] [bp-8h]@4
-  FactionTable *v10; // [sp+Ch] [bp-4h]@1
+  char *v10; // [sp+Ch] [bp-4h]@1
 
   v1 = 0;
-  v10 = this;
+  v10 = (char *)relations;
   if ( pHostileTXT_Raw )
     pAllocator->FreeChunk(pHostileTXT_Raw);
   pHostileTXT_Raw = 0;
@@ -10111,7 +10111,7 @@
     v2 = strtok(v1, "\r") + 1;
     v3 = 0;
     v9 = (signed int)v1;
-    v4 = (int)((char *)&v10[-7] + v8 - 5);
+    v4 = (int)&v10[v8-89];
     do
     {
       v5 = *v2;