diff Engine/SaveLoad.cpp @ 2572:d87bfbd3bb3b

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
line wrap: on
line diff
--- a/Engine/SaveLoad.cpp	Mon Oct 05 00:19:13 2015 +0200
+++ b/Engine/SaveLoad.cpp	Sat Mar 05 01:51:54 2016 +0200
@@ -34,7 +34,8 @@
 struct SavegameList *pSavegameList = new SavegameList;
 unsigned int uNumSavegameFiles;
 std::array<unsigned int, 45> pSavegameUsedSlots;
-std::array<struct RGBTexture, 45> pSavegameThumbnails;
+//std::array<struct RGBTexture, 45> pSavegameThumbnails;
+std::array<Image *, 45> pSavegameThumbnails;
 std::array<SavegameHeader, 45> pSavegameHeader;
 
 
@@ -231,7 +232,10 @@
   dword_6BE364_game_settings_1 |= GAME_SETTINGS_2000 | GAME_SETTINGS_0001;
 
   for (uint i = 0; i < uNumSavegameFiles; ++i)
-    pSavegameThumbnails[i].Release();
+  {
+      pSavegameThumbnails[i]->Release();
+      pSavegameThumbnails[i] = nullptr;
+  }
 
   pIcons_LOD->RemoveTexturesPackFromTextureList();
   if ( use_music_folder )
@@ -586,7 +590,10 @@
   //v3 = pSavegameThumbnails;
   viewparams->bRedrawGameUI = true;
   for (uint i = 0; i < 45; i++)
-    pSavegameThumbnails[i].Release();
+  {
+      pSavegameThumbnails[i]->Release();
+      pSavegameThumbnails[i] = nullptr;
+  }
 
   if ( _stricmp(pCurrentMapName, "d05.blv") )
     pNew_LOD->_4621A7();