mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 09:09:41 +00:00
Code Issues Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
Tom Mason 2012-12-26 23:52:16 +00:00
parent 51fce62b69
commit 299a1f32ed
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -537,20 +537,19 @@ void WindowManager::removeDialog(OEngine::GUI::Layout*dialog)
void WindowManager::messageBox (const std::string& message, const std::vector<std::string>& buttons) void WindowManager::messageBox (const std::string& message, const std::vector<std::string>& buttons)
{ {
/* If there are no buttons, and there is a dialogue window open, messagebox goes to the dialogue window */ if(buttons.empty()){
if(buttons.empty() && std::find(mGuiModes.begin(), mGuiModes.end(), GM_Dialogue) != mGuiModes.end()) /* If there are no buttons, and there is a dialogue window open, messagebox goes to the dialogue window */
mDialogueWindow->addMessageBox(MyGUI::LanguageManager::getInstance().replaceTags(message)); if(std::find(mGuiModes.begin(), mGuiModes.end(), GM_Dialogue) != mGuiModes.end())
mDialogueWindow->addMessageBox(MyGUI::LanguageManager::getInstance().replaceTags(message));
else{
if (buttons.empty())
{
mMessageBoxManager->createMessageBox(message);
}
else else
{ mMessageBoxManager->createMessageBox(message);
mMessageBoxManager->createInteractiveMessageBox(message, buttons); }
pushGuiMode(GM_InterMessageBox);
} else
{
mMessageBoxManager->createInteractiveMessageBox(message, buttons);
pushGuiMode(GM_InterMessageBox);
} }
} }