# HG changeset patch # User Nomad # Date 1350523318 -7200 # Node ID 4723e86bc51c1393ab76164bf6ad6356f7de11af # Parent e62134245ab0df0245f11dfa5dea7b903534e8d8 Party creation initial fix. diff -r e62134245ab0 -r 4723e86bc51c mm7_2.cpp --- a/mm7_2.cpp Thu Oct 18 03:18:04 2012 +0200 +++ b/mm7_2.cpp Thu Oct 18 03:21:58 2012 +0200 @@ -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 e62134245ab0 -r 4723e86bc51c mm7_4.cpp --- a/mm7_4.cpp Thu Oct 18 03:18:04 2012 +0200 +++ b/mm7_4.cpp Thu Oct 18 03:21:58 2012 +0200 @@ -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;