# HG changeset patch
# User Ritor1
# Date 1350529935 -21600
# Node ID 001b45e84aaa203e3610d0163694893f784fd54f
# Parent  e19e48280ca0d45a3bdae0e2966d2b42deeb2cf5# Parent  4723e86bc51c1393ab76164bf6ad6356f7de11af
Слияние

diff -r e19e48280ca0 -r 001b45e84aaa mm7_2.cpp
--- a/mm7_2.cpp	Thu Oct 18 09:12:00 2012 +0600
+++ b/mm7_2.cpp	Thu Oct 18 09:12:15 2012 +0600
@@ -14070,8 +14070,8 @@
   HWND v6; // eax@4
   int v8; // eax@15
   //bool v9; // edx@16
-  OtherOverlay *v10; // esi@44
-  signed int v11; // edi@44
+  //OtherOverlay *v10; // esi@44
+  //signed int v11; // edi@44
   unsigned int v12; // ecx@56
   HANDLE v13; // eax@68
   unsigned int startms; // [sp+8h] [bp-24h]@55
@@ -14162,15 +14162,10 @@
           if ( pAudioPlayer->hAILRedbook )
             AIL_redbook_stop(pAudioPlayer->hAILRedbook);
           pParty->Reset();
-          v10 = (OtherOverlay *)&pOtherOverlayList;
-          v11 = 50;
-          do
-          {
-            v10->Reset();
-            ++v10;
-            --v11;
-          }
-          while ( v11 );
+
+          for (uint k = 0; k < 50; ++k)
+            pOtherOverlayList->pOverlays[k].Reset();
+
           strcpy(pCurrentMapName, pStartingMapName);
           pParty->CreateDefaultParty(0);
           PlayerCreationUI_Initialize();
diff -r e19e48280ca0 -r 001b45e84aaa mm7_4.cpp
--- a/mm7_4.cpp	Thu Oct 18 09:12:00 2012 +0600
+++ b/mm7_4.cpp	Thu Oct 18 09:12:15 2012 +0600
@@ -5923,7 +5923,7 @@
   pTexture_MAKESKY = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("MAKESKY", TEXTURE_16BIT_PALETTE)];
   do
   {
-    sprintfex(pTmpBuf, "%s01", pPlayerPortraitsNames[uX]);
+    sprintf(pTmpBuf, "%s01", pPlayerPortraitsNames[uX]);
     v1 = pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE);
     v2 = uX * 4;
     ++uX;