Mercurial > mm7

diff Game/MainMenu.cpp @ 2547:fed97f15d1e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* SaveLoad * QuickReference * Modal * Character
author a.parshin
date Tue, 12 May 2015 01:45:31 +0200
parents c674d547cc7c
children 4008b2f34be0
line wrap: on
line diff
--- a/Game/MainMenu.cpp	Mon May 11 17:45:02 2015 +0200
+++ b/Game/MainMenu.cpp	Tue May 12 01:45:31 2015 +0200
@@ -12,6 +12,7 @@
 #include "GUI/GUIWindow.h"
 #include "GUI/GUIButton.h"
 #include "GUI/UI/UIPartyCreation.h"
+#include "GUI/UI/UISaveLoad.h"
 
 #include "Media/Audio/AudioPlayer.h"
 
@@ -259,7 +260,8 @@
             case UIMSG_Escape:
                 if (pModalWindow)
                 {
-                    ModalWindow_Release();
+                    pModalWindow->Release();
+                    pModalWindow = nullptr;
                     break;
                 }
                 if (!(dword_6BE364_game_settings_1 & GAME_SETTINGS_4000))
@@ -392,8 +394,9 @@
                 main_menu_background.Release();
                 main_menu_background.Load("lsave640.pcx", 0);
                 pGUIWindow2 = new GUIWindow(0, 0, window->GetWidth(), window->GetHeight(), 0, 0);
-                current_screen_type = SCREEN_LOADGAME;
-                LoadUI_Load(0);
+
+                //LoadUI_Load(0);
+                pGUIWindow_CurrentMenu = new GUIWindow_Load(false);
             }
             pWindow = pGUIWindow_CurrentMenu;
         }