comparison SaveLoad.cpp @ 169:d1dde383af89

Merge
author Nomad
date Thu, 14 Feb 2013 14:03:17 +0200
parents 572d821561f3
children 038a4d09406f
comparison
equal deleted inserted replaced
168:ee11772d0ad2 169:d1dde383af89
189 } 189 }
190 } 190 }
191 191
192 192
193 pGUIWindow_CurrentMenu->Release(); 193 pGUIWindow_CurrentMenu->Release();
194 pCurrentScreen = 0; 194 pCurrentScreen = SCREEN_GAME;
195 195
196 viewparams->bRedrawGameUI = true; 196 viewparams->bRedrawGameUI = true;
197 197
198 SetUserInterface(pParty->uAlignment, true); 198 SetUserInterface(pParty->uAlignment, true);
199 199
323 pOutdoor->uLastVisitDay = pParty->uTimePlayed; 323 pOutdoor->uLastVisitDay = pParty->uTimePlayed;
324 pScreenshot = MakeScreenshot(150, 112); 324 pScreenshot = MakeScreenshot(150, 112);
325 strcpy(pDir.pFilename, "image.pcx"); 325 strcpy(pDir.pFilename, "image.pcx");
326 pRenderer->_49F5A2((int)pScreenshot, 150, 112, DstBuf, 1000000, (int)&pDir.uDataSize); 326 pRenderer->_49F5A2((int)pScreenshot, 150, 112, DstBuf, 1000000, (int)&pDir.uDataSize);
327 free(pScreenshot); 327 free(pScreenshot);
328 if (pCurrentScreen == 11) //SaveScreen 328 if (pCurrentScreen == SCREEN_SAVEGAME)
329 { 329 {
330 pRenderer->DrawTextureIndexed(8, 8, (Texture *)(uTextureID_loadsave != -1 ? &pIcons_LOD->pTextures[uTextureID_loadsave] : 0)); 330 pRenderer->DrawTextureIndexed(8, 8, (Texture *)(uTextureID_loadsave != -1 ? &pIcons_LOD->pTextures[uTextureID_loadsave] : 0));
331 pRenderer->DrawTextureIndexed(0x12, 0x8D, (Texture *)(uTextureID_save_up != -1 ? &pIcons_LOD->pTextures[uTextureID_save_up] : 0)); 331 pRenderer->DrawTextureIndexed(0x12, 0x8D, (Texture *)(uTextureID_save_up != -1 ? &pIcons_LOD->pTextures[uTextureID_save_up] : 0));
332 v4 = pFontSmallnum->AlignText_Center(0xBA, pGlobalTXT_LocalizationStrings[190]); 332 v4 = pFontSmallnum->AlignText_Center(0xBA, pGlobalTXT_LocalizationStrings[190]);
333 pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, v4 + 25, 219, 0, pGlobalTXT_LocalizationStrings[190], 0, 0, 0); //Сохранение 333 pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, v4 + 25, 219, 0, pGlobalTXT_LocalizationStrings[190], 0, 0, 0); //Сохранение
612 int v2; // esi@2 612 int v2; // esi@2
613 RGBTexture *v3; // ebx@3 613 RGBTexture *v3; // ebx@3
614 int bNotArena; // [sp+2Ch] [bp-8h]@1 614 int bNotArena; // [sp+2Ch] [bp-8h]@1
615 unsigned int v6; // [sp+30h] [bp-4h]@1 615 unsigned int v6; // [sp+30h] [bp-4h]@1
616 616
617 __debugbreak(); 617 //__debugbreak();
618 618
619 v1 = uSlot; 619 v1 = uSlot;
620 v6 = uSlot; 620 v6 = uSlot;
621 bNotArena = _strcmpi(pCurrentMapName, "d05.blv"); 621 bNotArena = _strcmpi(pCurrentMapName, "d05.blv");
622 if ( bNotArena ) 622 if ( bNotArena )
634 pNew_LOD->CloseWriteFile(); 634 pNew_LOD->CloseWriteFile();
635 CopyFileA("data\\new.lod", pTmpBuf, 0); 635 CopyFileA("data\\new.lod", pTmpBuf, 0);
636 } 636 }
637 GUI_UpdateWindows(); 637 GUI_UpdateWindows();
638 pGUIWindow_CurrentMenu->Release(); 638 pGUIWindow_CurrentMenu->Release();
639 pCurrentScreen = 0; 639 pCurrentScreen = SCREEN_GAME;
640 v3 = pSavegameThumbnails; 640 v3 = pSavegameThumbnails;
641 viewparams->bRedrawGameUI = 1; 641 viewparams->bRedrawGameUI = 1;
642 do 642 do
643 { 643 {
644 v3->Release(); 644 v3->Release();