Mercurial > mm7
diff GUI/GUIWindow.cpp @ 2545:e06a3fe9ad6e
TravelUI init logic moved to GUIWindow_Travel
TransitionUI init logic moved to GUIWindow_Transition
author | a.parshin |
---|---|
date | Mon, 11 May 2015 16:43:46 +0200 |
parents | c674d547cc7c |
children | 4087cbc62706 |
line wrap: on
line diff
--- a/GUI/GUIWindow.cpp Mon May 11 09:51:04 2015 +0200 +++ b/GUI/GUIWindow.cpp Mon May 11 16:43:46 2015 +0200 @@ -215,27 +215,6 @@ } } -GUIWindow_Travel::GUIWindow_Travel(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) : - GUIWindow(x, y, width, height, button, hint) -{ - prev_screen_type = current_screen_type; - current_screen_type = SCREEN_CHANGE_LOCATION; - pBtn_ExitCancel = CreateButton(566, 445, 75, 33, 1, 0, UIMSG_CHANGE_LOCATION_ClickCencelBtn, 0, 'N', pGlobalTXT_LocalizationStrings[156], pIcons_LOD->GetTexture(uTextureID_BUTTDESC2), 0);// Stay in this area / Остаться в этой области - pBtn_YES = CreateButton(486, 445, 75, 33, 1, 0, UIMSG_OnTravelByFoot, 0, 'Y', hint, pIcons_LOD->GetTexture(uTextureID_BUTTYES2), 0); - CreateButton(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], 63, 73, 1, 0, UIMSG_OnTravelByFoot, 1, ' ', hint, 0, 0, 0); - CreateButton(8, 8, 460, 344, 1, 0, UIMSG_OnTravelByFoot, 1, 0, hint, 0); -} - -GUIWindow_Transition::GUIWindow_Transition(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) : - GUIWindow(x, y, width, height, button, hint) -{ - prev_screen_type = current_screen_type; - current_screen_type = SCREEN_INPUT_BLV; - pBtn_ExitCancel = CreateButton(0x236u, 0x1BDu, 0x4Bu, 0x21u, 1, 0, UIMSG_TransitionWindowCloseBtn, 0, 'N', pGlobalTXT_LocalizationStrings[34], pIcons_LOD->GetTexture(uTextureID_BUTTDESC2), 0); // Cancel / Отмена - pBtn_YES = CreateButton(0x1E6u, 0x1BDu, 0x4Bu, 0x21u, 1, 0, UIMSG_TransitionUI_Confirm, 0, 'Y', hint, pIcons_LOD->GetTexture(uTextureID_BUTTYES2), 0); - CreateButton(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], 0x3Fu, 0x49u, 1, 0, UIMSG_TransitionUI_Confirm, 1, 0x20u, hint, 0); - CreateButton(8, 8, 0x1CCu, 0x158u, 1, 0, UIMSG_TransitionUI_Confirm, 1u, 0, hint, 0); -} GUIWindow_Spellbook::GUIWindow_Spellbook(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) : GUIWindow(x, y, width, height, button, hint) @@ -426,27 +405,6 @@ GUIWindow::Release(); } -void GUIWindow_Travel::Release() -{ - pTexture_outside->Release(); - pTexture_Dialogue_Background->Release(); - pIcons_LOD->SyncLoadedFilesCount(); - current_screen_type = prev_screen_type; - - GUIWindow::Release(); -} - -void GUIWindow_Transition::Release() -{ - //pVideoPlayer->Unload(); - pTexture_outside->Release(); - pTexture_Dialogue_Background->Release(); - pIcons_LOD->SyncLoadedFilesCount(); - current_screen_type = prev_screen_type; - - GUIWindow::Release(); -} - void GUIWindow_Dialogue::Release() { if (!dword_591084) @@ -1672,21 +1630,6 @@ CharacterUI_CharacterScreen_Draw(pPlayers[uActiveCharacter]); } -void GUIWindow_Options::Update() -{ - GameMenuUI_Options_Draw(); -} - -void GUIWindow_KeymappingOptions::Update() -{ - GameMenuUI_DrawKeyBindings(); -} - -void GUIWindow_VideoOptions::Update() -{ - GameMenuUI_DrawVideoOptions(); -} - void GUIWindow_Book::Update() { BookUI_Draw((WindowType)(int)ptr_1C); @@ -1704,21 +1647,6 @@ GameUI_QuickRef_Draw(); } -void GUIWindow_Rest::Update() -{ - RestUI_Draw(); -} - -void GUIWindow_Travel::Update() -{ - TravelUI_Draw(); -} - -void GUIWindow_Transition::Update() -{ - TransitionUI_Draw(); -} - void GUIWindow_Dialogue::Update() { GameUI_DrawDialogue(); @@ -1813,26 +1741,6 @@ ModalWindow_ShowHint(); } -void GUIWindow_RestWindow::Update() -{ - __debugbreak(); // doesnt seems to get here, check stack trace & conditions - GUIButton GUIButton2; // [sp+28h] [bp-E0h]@133 - memset(&GUIButton2, 0, sizeof(GUIButton2)); - GUIButton2.uZ = 197; - GUIButton2.uW = 197; - GUIButton2.uX = 27; - GUIButton2.uY = 161; - GUIButton2.uWidth = 171; - GUIButton2.uHeight = 37; - GUIButton2.pParent = pButton_RestUI_WaitUntilDawn->pParent; - pAudioPlayer->PlaySound(SOUND_StartMainChoice02, 0, 0, -1, 0, 0, 0, 0); - pRenderer->DrawTextureIndexed(uFrameX, uFrameY, *((Texture **)ptr_1C + 15)); - viewparams->bRedrawGameUI = 1; - GUIButton2.DrawLabel(pGlobalTXT_LocalizationStrings[183], pFontCreate, 0, 0); // Rest & Heal 8 hrs / Отдых и лечение 8 часов - GUIButton2.pParent = 0; - Release(); -} - void OnButtonClick::Update() { if (Hint != (char *)1)