Mercurial > mm7
diff GUI/GUIWindow.cpp @ 2547:fed97f15d1e1
* SaveLoad
* QuickReference
* Modal
* Character
author | a.parshin |
---|---|
date | Tue, 12 May 2015 01:45:31 +0200 |
parents | 4087cbc62706 |
children | 87e5590d034b |
line wrap: on
line diff
--- a/GUI/GUIWindow.cpp Mon May 11 17:45:02 2015 +0200 +++ b/GUI/GUIWindow.cpp Tue May 12 01:45:31 2015 +0200 @@ -1615,13 +1615,6 @@ -void GUIWindow_CharacterRecord::Update() -{ -// ----------------------------------- -// 004156F0 GUI_UpdateWindows --- part - CharacterUI_CharacterScreen_Draw(pPlayers[uActiveCharacter]); -} - void GUIWindow_Book::Update() { // ----------------------------------- @@ -1638,13 +1631,6 @@ viewparams->bRedrawGameUI = true; } -void GUIWindow_QuickReference::Update() -{ -// ----------------------------------- -// 004156F0 GUI_UpdateWindows --- part - GameUI_QuickRef_Draw(); -} - void GUIWindow_Dialogue::Update() { // ----------------------------------- @@ -1683,20 +1669,6 @@ } } -void GUIWindow_Save::Update() -{ -// ----------------------------------- -// 004156F0 GUI_UpdateWindows --- part - SaveUI_Draw(); -} - -void GUIWindow_Load::Update() -{ -// ----------------------------------- -// 004156F0 GUI_UpdateWindows --- part - LoadUI_Draw(); -} - void GUIWindow_House::Update() { // ----------------------------------- @@ -1754,13 +1726,6 @@ pRenderer->DrawTextureIndexedAlpha(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pIcons_LOD->GetTexture(uTextureID_x_x_u)); } -void GUIWindow_Modal::Update() -{ -// ----------------------------------- -// 004156F0 GUI_UpdateWindows --- part - ModalWindow_ShowHint(); -} - void OnButtonClick::Update() { // ----------------------------------- @@ -2040,44 +2005,6 @@ Dst.DrawTitleText(pFontSmallnum, 0, 0xCu, ui_mainmenu_copyright_color, pGlobalTXT_LocalizationStrings[157], 3); } -enum CURRENT_SCREEN modal_window_prev_screen_type; - -//----- (004141CA) -------------------------------------------------------- -void ModalWindow(const char *pStrHint, UIMessageType OnRelease_message) -{ - pEventTimer->Pause(); - modal_window_prev_screen_type = current_screen_type; - pModalWindow = new GUIWindow_Modal(0, 0, window->GetWidth(), window->GetHeight(), OnRelease_message, pStrHint); - current_screen_type = SCREEN_MODAL_WINDOW; -} - -//----- (0041420D) -------------------------------------------------------- -void ModalWindow_ShowHint() -{ - GUIWindow pWindow; // [sp+4h] [bp-54h]@1 - - sprintf(pTmpBuf2.data(), "%s\n \n%s", pModalWindow->Hint, pGlobalTXT_LocalizationStrings[61]);// Press Escape - pWindow.Hint = pTmpBuf2.data(); - pWindow.uFrameWidth = 400; - pWindow.uFrameHeight = 100; - pWindow.uFrameX = 120; - pWindow.uFrameY = 140; - pWindow.uFrameZ = 519; - pWindow.uFrameW = 239; - pWindow.DrawMessageBox(0); -} - -//----- (0041426F) -------------------------------------------------------- -void ModalWindow_Release() -{ - pMessageQueue_50CBD0->AddGUIMessage((UIMessageType)pModalWindow->par1C, 0, 0); - - pModalWindow->Release(); - pModalWindow = nullptr; - - current_screen_type = modal_window_prev_screen_type; - pEventTimer->Resume(); -} //----- (00467FB6) -------------------------------------------------------- void CreateScrollWindow()