# HG changeset patch
# User Ritor1
# Date 1351363750 -21600
# Node ID ad87d8679e02967e23d5dbc163c7fd0e3f8013d9
# Parent  08ab7b5b85d8758c2b333ea2ab5fb01c37e937d3# Parent  8453114181af51dd06a2c3003b688ca553a7f0ec
Слияние

diff -r 8453114181af -r ad87d8679e02 mm7_4.cpp
--- a/mm7_4.cpp	Sat Oct 27 21:44:29 2012 +0200
+++ b/mm7_4.cpp	Sun Oct 28 00:49:10 2012 +0600
@@ -6187,8 +6187,8 @@
     if ( uControlParamd <= 3 )
       uXd = 0;
     pGUIWindow_CurrentMenu->CreateButton(
-      100 * uControlParamd / 3 + uXd + 17,
-      v0 * uControlParamd % 3 + 417,
+      100 * (uControlParamd / 3) + uXd + 17,
+      v0 * (uControlParamd % 3) + 417,
       100u,
       v0,
       1,
@@ -6286,9 +6286,9 @@
   signed int v16; // ecx@70
   unsigned int v18; // [sp-4h] [bp-84h]@48
   ItemGen item; // [sp+Ch] [bp-74h]@37
-  char v20; // [sp+30h] [bp-50h]@29
-  char v21; // [sp+31h] [bp-4Fh]@29
-  __int16 v22; // [sp+4Dh] [bp-33h]@29
+  char v20[31]; // [sp+30h] [bp-50h]@29
+  //char v21; // [sp+31h] [bp-4Fh]@29
+  //__int16 v22; // [sp+4Dh] [bp-33h]@29
   char v23; // [sp+4Fh] [bp-31h]@29
   MSG Msg; // [sp+50h] [bp-30h]@17
   POINT v25; // [sp+6Ch] [bp-14h]@6
@@ -6375,17 +6375,17 @@
   v0->Release();
   pGUIWindow_CurrentMenu->Release();
   pIcons_LOD->_4114F2();
-  v20 = 0;
-  memset(&v21, 0, 0x1Cu);
-  v22 = 0;
-  v23 = 0;
+  v20[0] = 0;
+  memset(&v20[1], 0, 0x1Cu);
+  *(_WORD*)&v20[29] = 0;
+  v20[31] = 0;
   do
   {
     v8 = 0;
     do
     {
       v9 = rand() % 32;
-      if ( !*(&v20 + v9) )
+      if ( !v20[v9] )
         break;
       ++v8;
     }
@@ -6393,15 +6393,15 @@
     if ( v8 == 10 )
     {
       v9 = 0;
-      if ( v20 )
+      if ( v20[0] )
       {
         do
           ++v9;
-        while ( *(&v20 + v9) );
+        while ( v20[v9] );
       }
     }
     pParty->field_854[v1++] = v9;
-    *(&v20 + v9) = 1;
+    v20[v9] = 1;
   }
   while ( (signed int)v1 < 32 );
   item.Reset();