teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Changes the logic of WindowManager::messageBox()

Browse source 
Fixes removeItem
Fixes addItem
This commit is contained in:
kpp 2013-05-10 01:19:04 +04:00
parent 7e05b725d0
commit 24d619d6b4
4 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/windowmanager.hpp
View file

@ -200,7 +200,7 @@ namespace MWBase
virtual void removeDialog(OEngine::GUI::Layout* dialog) = 0; virtual void removeDialog(OEngine::GUI::Layout* dialog) = 0;
///< Hides dialog and schedules dialog to be deleted. ///< Hides dialog and schedules dialog to be deleted.
virtual void messageBox (const std::string& message, const std::vector<std::string>& buttons = std::vector<std::string>()) = 0; virtual void messageBox (const std::string& message, const std::vector<std::string>& buttons = std::vector<std::string>(), bool showInDialogueModeOnly = false) = 0;
virtual void staticMessageBox(const std::string& message) = 0; virtual void staticMessageBox(const std::string& message) = 0;
virtual void removeStaticMessageBox() = 0; virtual void removeStaticMessageBox() = 0;

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

@ -584,18 +584,21 @@ namespace MWGui
mGarbageDialogs.push_back(dialog); mGarbageDialogs.push_back(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, bool showInDialogueModeOnly)
{ {
if(buttons.empty()){ if (buttons.empty()) {
/* If there are no buttons, and there is a dialogue window open, messagebox goes to the dialogue window */ /* If there are no buttons, and there is a dialogue window open, messagebox goes to the dialogue window */
if(!mGuiModes.empty() && mGuiModes.back() == GM_Dialogue) if (getMode() == GM_Dialogue) {
mDialogueWindow->addMessageBox(MyGUI::LanguageManager::getInstance().replaceTags(message)); mDialogueWindow->addMessageBox(MyGUI::LanguageManager::getInstance().replaceTags(message));
else } else {
mMessageBoxManager->createMessageBox(message); if (showInDialogueModeOnly) {
} if (getMode() == GM_Dialogue)
mMessageBoxManager->createMessageBox(message);
else } else {
{ mMessageBoxManager->createMessageBox(message);
}
}
} else {
mMessageBoxManager->createInteractiveMessageBox(message, buttons); mMessageBoxManager->createInteractiveMessageBox(message, buttons);
MWBase::Environment::get().getInputManager()->changeInputMode(isGuiMode()); MWBase::Environment::get().getInputManager()->changeInputMode(isGuiMode());
} }

2
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -191,7 +191,7 @@ namespace MWGui
virtual void removeDialog(OEngine::GUI::Layout* dialog); ///< Hides dialog and schedules dialog to be deleted. virtual void removeDialog(OEngine::GUI::Layout* dialog); ///< Hides dialog and schedules dialog to be deleted.
virtual void messageBox (const std::string& message, const std::vector<std::string>& buttons = std::vector<std::string>()); virtual void messageBox (const std::string& message, const std::vector<std::string>& buttons = std::vector<std::string>(), bool showInDialogueModeOnly = false);
virtual void staticMessageBox(const std::string& message); virtual void staticMessageBox(const std::string& message);
virtual void removeStaticMessageBox(); virtual void removeStaticMessageBox();
virtual void enterPressed (); virtual void enterPressed ();

18
apps/openmw/mwscript/containerextensions.cpp
View file

@ -66,8 +66,8 @@ namespace MWScript
MWWorld::Class::get (ptr).getContainerStore (ptr).add (ref.getPtr()); MWWorld::Class::get (ptr).getContainerStore (ptr).add (ref.getPtr());
// Spawn a messagebox (only for items added to player's inventory) // Spawn a messagebox (only for items added to player's inventory and if player is talking to someone)
if (ptr == MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer()) if (ptr == MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer() )
{ {
// The two GMST entries below expand to strings informing the player of what, and how many of it has been added to their inventory // The two GMST entries below expand to strings informing the player of what, and how many of it has been added to their inventory
std::string msgBox; std::string msgBox;
@ -82,8 +82,8 @@ namespace MWScript
msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage61}"); msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage61}");
msgBox = boost::str(boost::format(msgBox) % count % itemName); msgBox = boost::str(boost::format(msgBox) % count % itemName);
} }
std::vector <std::string> noButtons;
MWBase::Environment::get().getWindowManager()->messageBox(msgBox); MWBase::Environment::get().getWindowManager()->messageBox(msgBox, noButtons, /*showInDialogueModeOnly*/ true);
} }
} }
}; };
@ -161,12 +161,15 @@ namespace MWScript
} }
} }
// Spawn a messagebox (only for items added to player's inventory) // Spawn a messagebox (only for items removed from player's inventory)
if (ptr == MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer()) if (ptr == MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer())
{ {
// The two GMST entries below expand to strings informing the player of what, and how many of it has been removed from their inventory // The two GMST entries below expand to strings informing the player of what, and how many of it has been removed from their inventory
std::string msgBox; std::string msgBox;
int numRemoved = (originalCount - count); int numRemoved = (originalCount - count);
if (numRemoved == 0)
return;
if(numRemoved > 1) if(numRemoved > 1)
{ {
msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage63}"); msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage63}");
@ -177,9 +180,8 @@ namespace MWScript
msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage62}"); msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage62}");
msgBox = boost::str (boost::format(msgBox) % itemName); msgBox = boost::str (boost::format(msgBox) % itemName);
} }
std::vector <std::string> noButtons;
if (numRemoved > 0) MWBase::Environment::get().getWindowManager()->messageBox(msgBox, noButtons, /*showInDialogueModeOnly*/ true);
MWBase::Environment::get().getWindowManager()->messageBox(msgBox);
} }
} }
}; };