Mercurial > mm7

diff Game/MainMenuLoad.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 48708da03b7f
children
line wrap: on
line diff
--- a/Game/MainMenuLoad.cpp	Mon Oct 05 00:19:13 2015 +0200
+++ b/Game/MainMenuLoad.cpp	Sat Mar 05 01:51:54 2016 +0200
@@ -1,4 +1,5 @@
 #include "Engine/Engine.h"
+#include "Engine/AssetsManager.h"
 #include "Engine/SaveLoad.h"
 #include "Engine/LOD.h"
 #include "Engine/Timer.h"
@@ -95,8 +96,14 @@
                 {
                     pIcons_LOD->RemoveTexturesPackFromTextureList();
                     //crt_deconstruct_ptr_6A0118();
-                    main_menu_background.Release();
-                    main_menu_background.Load("title.pcx", 0);
+
+                    if (main_menu_background)
+                    {
+                        main_menu_background->Release();
+                        main_menu_background = nullptr;
+                    }
+                    main_menu_background = assets->GetImage_PCXFromIconsLOD(L"title.pcx");
+
                     SetCurrentMenuID(MENU_MAIN);
                     current_screen_type = SCREEN_GAME;
                     pEventTimer->Resume();
@@ -113,8 +120,12 @@
 {
     current_screen_type = SCREEN_LOADGAME;
 
-    main_menu_background.Release();
-    main_menu_background.Load("lsave640.pcx", 0);
+    if (main_menu_background)
+    {
+        main_menu_background->Release();
+        main_menu_background = nullptr;
+    }
+    main_menu_background = assets->GetImage_PCXFromIconsLOD(L"lsave640.pcx");
 
         //LoadUI_Load(0);
     pGUIWindow_CurrentMenu = new GUIWindow_Load(false);
@@ -137,7 +148,7 @@
         }
 
         pRenderer->BeginScene();
-        pRenderer->DrawTextureNew(0, 0, &main_menu_background);
+        pRenderer->DrawTextureNew(0, 0, main_menu_background);
 
         MainMenuLoad_EventLoop();
         GUI_UpdateWindows();