Mercurial > mm7

comparison Engine/SaveLoad.cpp @ 2572:d87bfbd3bb3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Step towards unification of Texture and RGBTexture (class Image)
author a.parshin
date Sat, 05 Mar 2016 01:51:54 +0200
parents 117c219bf913
children 0c67be4ec900
comparison
equal deleted inserted replaced
2571:cf29f444ddd7 2572:d87bfbd3bb3b
32 32
33 33
34 struct SavegameList *pSavegameList = new SavegameList; 34 struct SavegameList *pSavegameList = new SavegameList;
35 unsigned int uNumSavegameFiles; 35 unsigned int uNumSavegameFiles;
36 std::array<unsigned int, 45> pSavegameUsedSlots; 36 std::array<unsigned int, 45> pSavegameUsedSlots;
37 std::array<struct RGBTexture, 45> pSavegameThumbnails; 37 //std::array<struct RGBTexture, 45> pSavegameThumbnails;
38 std::array<Image *, 45> pSavegameThumbnails;
38 std::array<SavegameHeader, 45> pSavegameHeader; 39 std::array<SavegameHeader, 45> pSavegameHeader;
39 40
40 41
41 42
42 //----- (0045EE8A) -------------------------------------------------------- 43 //----- (0045EE8A) --------------------------------------------------------
229 230
230 strcpy(pCurrentMapName, header.pLocationName); 231 strcpy(pCurrentMapName, header.pLocationName);
231 dword_6BE364_game_settings_1 |= GAME_SETTINGS_2000 | GAME_SETTINGS_0001; 232 dword_6BE364_game_settings_1 |= GAME_SETTINGS_2000 | GAME_SETTINGS_0001;
232 233
233 for (uint i = 0; i < uNumSavegameFiles; ++i) 234 for (uint i = 0; i < uNumSavegameFiles; ++i)
234 pSavegameThumbnails[i].Release(); 235 {
236 pSavegameThumbnails[i]->Release();
237 pSavegameThumbnails[i] = nullptr;
238 }
235 239
236 pIcons_LOD->RemoveTexturesPackFromTextureList(); 240 pIcons_LOD->RemoveTexturesPackFromTextureList();
237 if ( use_music_folder ) 241 if ( use_music_folder )
238 alSourcef (mSourceID, AL_GAIN, pSoundVolumeLevels[uMusicVolimeMultiplier]); 242 alSourcef (mSourceID, AL_GAIN, pSoundVolumeLevels[uMusicVolimeMultiplier]);
239 else 243 else
584 pGUIWindow_CurrentMenu->Release(); 588 pGUIWindow_CurrentMenu->Release();
585 current_screen_type = SCREEN_GAME; 589 current_screen_type = SCREEN_GAME;
586 //v3 = pSavegameThumbnails; 590 //v3 = pSavegameThumbnails;
587 viewparams->bRedrawGameUI = true; 591 viewparams->bRedrawGameUI = true;
588 for (uint i = 0; i < 45; i++) 592 for (uint i = 0; i < 45; i++)
589 pSavegameThumbnails[i].Release(); 593 {
594 pSavegameThumbnails[i]->Release();
595 pSavegameThumbnails[i] = nullptr;
596 }
590 597
591 if ( _stricmp(pCurrentMapName, "d05.blv") ) 598 if ( _stricmp(pCurrentMapName, "d05.blv") )
592 pNew_LOD->_4621A7(); 599 pNew_LOD->_4621A7();
593 else 600 else
594 ShowStatusBarString(pGlobalTXT_LocalizationStrings[583], 2);// "No saving in the Arena" 601 ShowStatusBarString(pGlobalTXT_LocalizationStrings[583], 2);// "No saving in the Arena"