Mercurial > mm7

changeset 386:5632b38d421c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Sat, 23 Feb 2013 01:50:50 +0400
parents b509ef97807a (current diff) c31e87e41131 (diff)
children 84f53d7fc96d
files
diffstat 1 files changed, 4 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/GUIWindow.cpp	Sat Feb 23 01:50:18 2013 +0400
+++ b/GUIWindow.cpp	Sat Feb 23 01:50:50 2013 +0400
@@ -465,9 +465,7 @@
   unsigned int v19; // edi@43
   unsigned int v20; // edi@45
   void *v21; // esi@45
-  char *v22; // [sp+10h] [bp-5Ch]@9
   signed int v23; // [sp+10h] [bp-5Ch]@38
-  int v24; // [sp+14h] [bp-58h]@9
   char *v25; // [sp+14h] [bp-58h]@21
   GUIWindow v26; // [sp+18h] [bp-54h]@8
 
@@ -720,12 +718,9 @@
           if ( dword_506528 < 29 )
           {
             v3 = (__int64 *)&pParty->field_3C.field_4F0[2 * dword_506528];
-            v24 = dword_506528 + 1;
-            //v22 = (char *)&pStorylineText->StoreLine[dword_506528].pPageTitle;//guess //field_4[3 * dword_506528 + 2];
-			v22 = (char *)&pStorylineText->StoreLine[dword_506528+1].pText;
-            do
+			for(int i=dword_506528+1;i<dword_506528+31;i++)
             {
-              v4 = *(char **)v22;
+			  v4 = pStorylineText->StoreLine[i].pText;
               if ( *v3 )
               {
                 if ( v4 )
@@ -736,7 +731,7 @@
                   v8 = v7 + 1;
                   if ( (signed int)v7 + 1 > 0 )
                   {
-                    memset32((char *)&pStru179 + 4 * dword_506520 , v24, v8);
+                    memset32((char *)&pStru179 + 4 * dword_506520 , i, v8);
                     do
                     {
                       LODWORD(v7) = dword_506520++;
@@ -747,13 +742,9 @@
                   }
                 }
               }
-              v22 += 12;
+              ++i;
               ++v3;
-              ++v24;
-              //__debugbreak(); // fix condition
             }
-            //while ( (signed int)v22 < (signed int)&pFactionTable->relations + 8 );
-			while ( (signed int)v22 <= (signed int)&pStorylineText->StoreLine[30].uTime );
           }
         }
       }