# HG changeset patch
# User Gloval
# Date 1361310040 -14400
# Node ID 3c011f4ccba38815d5b2732f8eb805d9461c7302
# Parent  4c2cdda88562a257c1adf9819e4d28d839133e63# Parent  53b9b07ab9ec2b4a989bc285747e62993b46928c
Merge

diff -r 4c2cdda88562 -r 3c011f4ccba3 mm7_1.cpp
--- a/mm7_1.cpp	Wed Feb 20 01:40:18 2013 +0400
+++ b/mm7_1.cpp	Wed Feb 20 01:40:40 2013 +0400
@@ -2368,9 +2368,9 @@
   int v59; // [sp-8h] [bp-280h]@56
   int v60; // [sp-8h] [bp-280h]@58
   unsigned int v61; // [sp-8h] [bp-280h]@110
-  char a1[100]; // [sp+8h] [bp-270h]@40
-  char Dest[100]; // [sp+6Ch] [bp-20Ch]@40
-  char v64[100]; // [sp+D0h] [bp-1A8h]@40
+  char a1[300]; // [sp+8h] [bp-270h]@40
+  //char Dest[100]; // [sp+6Ch] [bp-20Ch]@40
+  //char v64[100]; // [sp+D0h] [bp-1A8h]@40
   char v65[120]; // [sp+134h] [bp-144h]@92
   char Source[40]; // [sp+1ACh] [bp-CCh]@49
   int v67; // [sp+1D4h] [bp-A4h]@91
@@ -2538,8 +2538,8 @@
       goto LABEL_116;
     }
     sprintf(a1, pGlobalTXT_LocalizationStrings[463], *((int *)v3 + 2));
-    strcpy(Dest, "");
-    strcpy(v64, "");
+    strcpy(&a1[100], "");
+    strcpy(&a1[200], "");
     v20 = v3[28];
     if ( (unsigned __int8)v20 <= 1u )
     {
@@ -2560,7 +2560,7 @@
             v21 = v3[30];
             if ( v21 )
               sprintf(
-                Dest,
+                &a1[100],
                 "%s: +%d",
                 pGlobalTXT_LocalizationStrings[11],
                 (unsigned __int8)v21 + (unsigned __int8)v3[32]);
@@ -2574,12 +2574,12 @@
       v45 = (unsigned __int8)v3[32];
       v43 = pGlobalTXT_LocalizationStrings[203];
     }
-    sprintf(Dest, "%s: +%d   %s: %dd%d", v43, v45, v48, v53, v58);
+    sprintf(&a1[100], "%s: +%d   %s: %dd%d", v43, v45, v48, v53, v58);
     v22 = v3[32];
     if ( v22 )
     {
       sprintf(Source, " +%d", (unsigned __int8)v22);
-      strcat(Dest, Source);
+      strcat(&a1[100], Source);
     }
 LABEL_50:
     if ( v77 )
@@ -2753,7 +2753,7 @@
       v54 = pGlobalTXT_LocalizationStrings[449];
       v49 = "%s: %d";
 LABEL_64:
-      sprintf(v64, v49, v54, v59);
+      sprintf(&a1[200], v49, v54, v59);
       goto LABEL_65;
     }
     v25 = _this->_bonus_type;
@@ -2783,7 +2783,7 @@
       v50 = pGlobalTXT_LocalizationStrings[210];
       v46 = "%s: %s";
     }
-    sprintf(v64, v46, v50, v55, v60);
+    sprintf(&a1[200], v46, v50, v55, v60);
     goto LABEL_65;
 }
 // 4E455C: using guessed type int dword_4E455C;