Mercurial > might-and-magic-trilogy

diff mm7_2.cpp @ 102:3b5267621a5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
trash globals
author Nomad
date Tue, 06 Nov 2012 06:42:58 +0200
parents 8be5293b6b33
children 62772029b56d
line wrap: on
line diff
--- a/mm7_2.cpp	Tue Nov 06 06:15:25 2012 +0200
+++ b/mm7_2.cpp	Tue Nov 06 06:42:58 2012 +0200
@@ -953,7 +953,9 @@
         v7 = v6 + 2 * v2 - 30;
         v2 = (signed int)v0->ptr_1C;
         v4 = word_4F0498[5 * v7];
-        v5 = *(short *)&aTooManyStation[2 * (5 * (v6 + 2 * v2) + rand() % 4) + 10];
+        __debugbreak();
+        //things happen around word_4F0400 actually
+        //v5 = *(short *)&aTooManyStation[2 * (5 * (v6 + 2 * v2) + rand() % 4) + 10];
         goto LABEL_13;
       }
       if ( v2 <= 41 )
@@ -3839,7 +3841,7 @@
   dword_F8B19C = v55;
   if ( v3 < 19 )
   {
-    v9 = pIcons_LOD->LoadTexture((&off_4F03B8)[4 * v3], TEXTURE_16BIT_PALETTE);
+    v9 = pIcons_LOD->LoadTexture(off_4F03B8[v3], TEXTURE_16BIT_PALETTE);
     v3 = dword_F8B198;
     dword_F8B164 = &pIcons_LOD->pTextures[v9];
 LABEL_13:
@@ -10295,7 +10297,7 @@
                             v7 = 44;
                             goto LABEL_71;
                           }
-                          if ( !_strcmpi(*(const char **)(v2 + 4), off_4E876C) )
+                          if ( !_strcmpi(*(const char **)(v2 + 4), "Ice") )
                           {
                             v7 = 26;
                             goto LABEL_71;
@@ -10548,7 +10550,7 @@
     {
       if ( _strcmpi(v1, "FIRE") )
       {
-        if ( _strcmpi(v1, off_4E887C) )
+        if ( _strcmpi(v1, "AIR") )
         {
           if ( _strcmpi(v1, "WATER") )
           {
@@ -10940,7 +10942,7 @@
         for ( j = 0; j < v41.field_0; ++j )
         {
           v27 = v41.pProperties[j];
-          if ( _strcmpi(v41.pProperties[j], off_4E8CB8) )
+          if ( _strcmpi(v41.pProperties[j], "NBM") )
           {
             if ( _strcmpi(v27, "Invisible") )
             {