Mercurial > mm7
diff UI/UIHouses.cpp @ 2225:080fd5a5433d
Merge
| author | Grumpy7 |
|---|---|
| date | Wed, 19 Feb 2014 22:30:39 +0100 |
| parents | e9625ad08541 |
| children | fd0b2a697416 |
line wrap: on
line diff
--- a/UI/UIHouses.cpp Wed Feb 19 22:26:10 2014 +0100 +++ b/UI/UIHouses.cpp Wed Feb 19 22:30:39 2014 +0100 @@ -1008,7 +1008,7 @@ return; } pDialogueWindow->Release(); - pDialogueWindow = GUIWindow::Create(0, 0, 640, 345, WINDOW_MainMenu, 0, 0); + pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), 345, WINDOW_MainMenu, 0, 0); pBtn_ExitCancel = pDialogueWindow->CreateButton(526, 445, 75, 33, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[74],// "End Conversation" pIcons_LOD->GetTexture(uTextureID_BUTTDESC2), 0); pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", nullptr); @@ -1020,7 +1020,7 @@ || in_current_building_type != BuildingType_Temple || uMessageParam != BuildingType_MindGuild ) { pDialogueWindow->Release(); - pDialogueWindow = GUIWindow::Create(0, 0, 640, 345, WINDOW_MainMenu, 0, 0); + pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), 345, WINDOW_MainMenu, 0, 0); pBtn_ExitCancel = pDialogueWindow->CreateButton(526, 445, 75, 33, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[74],// "End Conversation" pIcons_LOD->GetTexture(uTextureID_BUTTDESC2), 0); pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", nullptr); @@ -2019,9 +2019,9 @@ { if ( pArcomageGame->bGameInProgress == 1 ) return; - if ( pArcomageGame->uGameResult ) + if ( pArcomageGame->uGameWinner ) { - if ( pArcomageGame->uGameResult == 1 ) + if ( pArcomageGame->uGameWinner == 1 ) pText = pGlobalTXT_LocalizationStrings[640];// You won! else pText = pGlobalTXT_LocalizationStrings[641];// You lost!