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

replaced explicit text with GMST entries, thanks to zinnschlag

Browse source
This commit is contained in:
Tom Mason 2012-12-27 15:28:13 +00:00
parent ba2301a156
commit ad9b86058b
3 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/dialogue.cpp
View file

@ -370,7 +370,7 @@ void DialogueWindow::addText(std::string text)
mHistory->addDialogText("#B29154"+parseText(text)+"#B29154"); mHistory->addDialogText("#B29154"+parseText(text)+"#B29154");
} }
void DialogueWindow::addMessageBox(std::string text) void DialogueWindow::addMessageBox(const std::string& text)
{ {
mHistory->addDialogText("\n#FFFFFF"+text+"#B29154"); mHistory->addDialogText("\n#FFFFFF"+text+"#B29154");
} }

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

@ -65,7 +65,7 @@ namespace MWGui
void setKeywords(std::list<std::string> keyWord); void setKeywords(std::list<std::string> keyWord);
void removeKeyword(std::string keyWord); void removeKeyword(std::string keyWord);
void addText(std::string text); void addText(std::string text);
void addMessageBox(std::string text); void addMessageBox(const std::string& text);
void addTitle(std::string text); void addTitle(std::string text);
void askQuestion(std::string question); void askQuestion(std::string question);
void goodbye(); void goodbye();

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

@ -3,6 +3,10 @@
#include <stdexcept> #include <stdexcept>
#include <boost/format.hpp>
#include <MyGUI_LanguageManager.h>
#include <components/compiler/extensions.hpp> #include <components/compiler/extensions.hpp>
#include <components/interpreter/interpreter.hpp> #include <components/interpreter/interpreter.hpp>
@ -109,6 +113,7 @@ namespace MWScript
MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr); MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr);
std::string itemName = ""; std::string itemName = "";
Interpreter::Type_Integer originalCount = count;
for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end() && count; for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end() && count;
++iter) ++iter)
@ -130,7 +135,25 @@ namespace MWScript
} }
} }
MWBase::Environment::get().getWindowManager()->messageBox(itemName + " has been removed from your inventory.", std::vector<std::string>()); /* 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;
if(originalCount - count > 1)
{
msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage63}");
std::stringstream temp;
temp << boost::format(msgBox) % (originalCount - count) % itemName;
msgBox = temp.str();
}
else
{
msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage62}");
std::stringstream temp;
temp << boost::format(msgBox) % itemName;
msgBox = temp.str();
}
if(originalCount - count > 0)
MWBase::Environment::get().getWindowManager()->messageBox(msgBox, std::vector<std::string>());
// To be fully compatible with original Morrowind, we would need to check if // To be fully compatible with original Morrowind, we would need to check if
// count is >= 0 here and throw an exception. But let's be tollerant instead. // count is >= 0 here and throw an exception. But let's be tollerant instead.