mm7: SaveLoad.cpp comparison

comparison SaveLoad.cpp @ 568:6f7d936edc9b

SaveGame/LoadGame sorta works

author	Nomad
date	Tue, 05 Mar 2013 04:30:20 +0200
parents	604d70894002
children	353ff9ea11e6

comparison

equal deleted inserted replaced

-:f51373466911
+:6f7d936edc9b
 unsigned int v69; // [sp+260h] [bp-10h]@23
 int v70; // [sp+264h] [bp-Ch]@22
 std::string *v71; // [sp+268h] [bp-8h]@8
 int a3; // [sp+26Fh] [bp-1h]@8
-v66 = a2;
+//v66 = a2;
 strcpy(byte_6BE3B0, pCurrentMapName);
-if (!_strcmpi(pCurrentMapName, "d05.blv"))
+if (!_strcmpi(pCurrentMapName, "d05.blv")) // arena
 return false;
 DstBuf = malloc(0xF4240);
 pDir.Reset();
 pPositionX = pParty->vPosition.x;
 v51 = pParty->vPosition.y;
 v62 = pParty->vPosition.z;
 strcpy(pDir.pFilename, "image.pcx");
 pRenderer->_49F5A2((int)pScreenshot, 150, 112, DstBuf, 1000000, (int)&pDir.uDataSize);
 free(pScreenshot);
 if (pCurrentScreen == SCREEN_SAVEGAME)
 {
-pRenderer->DrawTextureIndexed(8, 8, (Texture *)(uTextureID_loadsave != -1 ? &pIcons_LOD->pTextures[uTextureID_loadsave] : 0));
+pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->GetTexture(uTextureID_loadsave));
-pRenderer->DrawTextureIndexed(0x12, 0x8D, (Texture *)(uTextureID_save_up != -1 ? &pIcons_LOD->pTextures[uTextureID_save_up] : 0));
+pRenderer->DrawTextureIndexed(18, 141, pIcons_LOD->GetTexture(uTextureID_save_up));
 v4 = pFontSmallnum->AlignText_Center(0xBA, pGlobalTXT_LocalizationStrings[190]);
 pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, v4 + 25, 219, 0, pGlobalTXT_LocalizationStrings[190], 0, 0, 0); //Сохранение
-v5 = pFontSmallnum->AlignText_Center(0xBA, (const char *)&pSavegameHeader + 100 * uLoadGameUI_SelectedSlot);
+v5 = pFontSmallnum->AlignText_Center(0xBA, pSavegameHeader[uLoadGameUI_SelectedSlot].pName);
-pGUIWindow_CurrentMenu->DrawTextInRect(pFontSmallnum, v5 + 25, 0x103u, 0, (const char *)(&pSavegameHeader + uLoadGameUI_SelectedSlot), 185, 0);
+pGUIWindow_CurrentMenu->DrawTextInRect(pFontSmallnum, v5 + 25, 0x103u, 0, pSavegameHeader[uLoadGameUI_SelectedSlot].pName, 185, 0);
 v6 = pFontSmallnum->AlignText_Center(0xBA, pGlobalTXT_LocalizationStrings[165]);
 pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, v6 + 25, 299, 0, pGlobalTXT_LocalizationStrings[165], 0, 0, 0); //Пожалуйста, подождите
 pRenderer->Present();
 }
 if (pNew_LOD->Write(&pDir, DstBuf, 0))
 {
 sprintf(Str, pGlobalTXT_LocalizationStrings[612], 200); //Сохраненная игра повреждена! Code=%d
 MessageBoxA(nullptr, Str, "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\LoadSave.cpp:773", 0);
 }
 {
 sprintf(Str, pGlobalTXT_LocalizationStrings[612], 204);
 MessageBoxA(nullptr, Str, "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\LoadSave.cpp:811", 0);
 }
 strcpy(pDir.pFilename, "npcdata.bin");
-pDir.uDataSize = 38076;
+pDir.uDataSize = 501 * sizeof(NPCData);
+assert(pDir.uDataSize == 38076);
 if ( pNew_LOD->Write(&pDir, pNPCStats->pNewNPCData, 0) )
 {
 sprintf(Str, pGlobalTXT_LocalizationStrings[612], 205);
 MessageBoxA(nullptr, Str, "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\LoadSave.cpp:820", 0);
 }
 }
 }
 if ( (signed int)uNumLevelDecorations > 0 )
 {
 v66 = &pLevelDecorations[0].field_2;
-for (int i =  0; i <= (signed int)uNumLevelDecorations; ++i)
+for (int i = 0; i <= (signed int)uNumLevelDecorations; ++i)
 {
 memcpy(v22, v66, 2);
 v66 += 16;
 v22 = (char *)v22 + 2;
 }
 //----- (00460078) --------------------------------------------------------
 void __fastcall DoSavegame(unsigned int uSlot)
 {
-unsigned int v1; // esi@1
+//unsigned int v1; // esi@1
-int v2; // esi@2
+//int v2; // esi@2
 //RGBTexture *v3; // ebx@3
 int bNotArena; // [sp+2Ch] [bp-8h]@1
-unsigned int v6; // [sp+30h] [bp-4h]@1
+//unsigned int v6; // [sp+30h] [bp-4h]@1
 //__debugbreak();
-v1 = uSlot;
+//v1 = uSlot;
-v6 = uSlot;
+//v6 = uSlot;
 bNotArena = _strcmpi(pCurrentMapName, "d05.blv");
 if ( bNotArena )
 {
 LOD::Directory pDir; // [sp+Ch] [bp-28h]@2
 SaveGame(0, 0);
-v2 = 100 * v1;
+//v2 = 100 * v1;
-strcpy(&pSavegameHeader->pLocationName[v2], pCurrentMapName);
+strcpy(pSavegameHeader[uSlot].pLocationName, pCurrentMapName);
-*(int *)((char *)&pSavegameHeader->uWordTime + v2) = LODWORD(pParty->uTimePlayed);
+pSavegameHeader[uSlot].uWordTime = pParty->uTimePlayed;
-*(int *)((char *)&pSavegameHeader->uWordTime + v2 + 4) = HIDWORD(pParty->uTimePlayed);
+strcpy(pDir.pFilename, "header.bin");
-strcpy((char *)&pDir, "header.bin");
 pDir.uDataSize = 100;
-pNew_LOD->Write(&pDir, (char *)&pSavegameHeader + v2, 0);
+pNew_LOD->Write(&pDir, &pSavegameHeader[uSlot], 0);
-sprintf(pTmpBuf, "saves\\save%03d.mm7", v6);
+sprintf(pTmpBuf, "saves\\save%03d.mm7", uSlot);
 pNew_LOD->CloseWriteFile();
 CopyFileA("data\\new.lod", pTmpBuf, 0);
 }
 GUI_UpdateWindows();
 pGUIWindow_CurrentMenu->Release();
 pCurrentScreen = SCREEN_GAME;
 //v3 = pSavegameThumbnails;
 viewparams->bRedrawGameUI = 1;
-for(int i=0;i<45;i++)
+for (uint i = 0; i < 45; i++)
-{
 pSavegameThumbnails[i].Release();
-}
 //while ( (signed int)v3 < (signed int)&unk_6A0758 );
 if ( bNotArena )
 pNew_LOD->_4621A7();
 else
 ShowStatusBarString(pGlobalTXT_LocalizationStrings[583], 2u);// "No saving in the Arena"
 pIcons_LOD->_4355F7();
 pEventTimer->Resume();
 ShowStatusBarString(pGlobalTXT_LocalizationStrings[656], 2u);// "Game Saved!"
-viewparams->bRedrawGameUI = 1;
+viewparams->bRedrawGameUI = true;
 }
 // 4E28F8: using guessed type int pCurrentScreen;

Mercurial > mm7

comparison SaveLoad.cpp @ 568:6f7d936edc9b