Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
2546:4087cbc62706 2547:fed97f15d1e1
10 #include "IO/Keyboard.h" 10 #include "IO/Keyboard.h"
11 11
12 #include "GUI/GUIWindow.h" 12 #include "GUI/GUIWindow.h"
13 #include "GUI/GUIButton.h" 13 #include "GUI/GUIButton.h"
14 #include "GUI/UI/UIPartyCreation.h" 14 #include "GUI/UI/UIPartyCreation.h"
15 #include "GUI/UI/UISaveLoad.h"
15 16
16 #include "Media/Audio/AudioPlayer.h" 17 #include "Media/Audio/AudioPlayer.h"
17 18
18 #include "Game/MainMenu.h" 19 #include "Game/MainMenu.h"
19 20
257 SetCurrentMenuID(MENU_DebugBLVLevel); 258 SetCurrentMenuID(MENU_DebugBLVLevel);
258 break; 259 break;
259 case UIMSG_Escape: 260 case UIMSG_Escape:
260 if (pModalWindow) 261 if (pModalWindow)
261 { 262 {
262 ModalWindow_Release(); 263 pModalWindow->Release();
264 pModalWindow = nullptr;
263 break; 265 break;
264 } 266 }
265 if (!(dword_6BE364_game_settings_1 & GAME_SETTINGS_4000)) 267 if (!(dword_6BE364_game_settings_1 & GAME_SETTINGS_4000))
266 break; 268 break;
267 v15 = 1; 269 v15 = 1;
390 if (current_screen_type != SCREEN_LOADGAME) 392 if (current_screen_type != SCREEN_LOADGAME)
391 { 393 {
392 main_menu_background.Release(); 394 main_menu_background.Release();
393 main_menu_background.Load("lsave640.pcx", 0); 395 main_menu_background.Load("lsave640.pcx", 0);
394 pGUIWindow2 = new GUIWindow(0, 0, window->GetWidth(), window->GetHeight(), 0, 0); 396 pGUIWindow2 = new GUIWindow(0, 0, window->GetWidth(), window->GetHeight(), 0, 0);
395 current_screen_type = SCREEN_LOADGAME; 397
396 LoadUI_Load(0); 398 //LoadUI_Load(0);
399 pGUIWindow_CurrentMenu = new GUIWindow_Load(false);
397 } 400 }
398 pWindow = pGUIWindow_CurrentMenu; 401 pWindow = pGUIWindow_CurrentMenu;
399 } 402 }
400 403
401 while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) 404 while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE))