mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 09:45:32 +00:00
Code Issues Releases Wiki Activity

Fix case issue when setting companion's profit on the script

Browse source
This commit is contained in:
scrawl 2014-09-11 19:20:04 +02:00
parent e54ba2c5d1
commit 04c79d5f1e
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -148,7 +148,7 @@ void CompanionWindow::onMessageBoxButtonClicked(int button)
if (button == 0) if (button == 0)
{ {
mPtr.getRefData().getLocals().setVarByInt(mPtr.getClass().getScript(mPtr), mPtr.getRefData().getLocals().setVarByInt(mPtr.getClass().getScript(mPtr),
"minimumProfit", mPtr.getClass().getNpcStats(mPtr).getProfit()); "minimumprofit", mPtr.getClass().getNpcStats(mPtr).getProfit());
MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion); MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);
MWBase::Environment::get().getDialogueManager()->startDialogue (mPtr); MWBase::Environment::get().getDialogueManager()->startDialogue (mPtr);

5
apps/openmw/mwscript/locals.hpp
View file

@ -24,8 +24,11 @@ namespace MWScript
bool isEmpty() const; bool isEmpty() const;
void configure (const ESM::Script& script); void configure (const ESM::Script& script);
/// @note var needs to be in lowercase
bool setVarByInt(const std::string& script, const std::string& var, int val); bool setVarByInt(const std::string& script, const std::string& var, int val);
int getIntVar (const std::string& script, const std::string& var); ///< if var does not exist, returns 0 int getIntVar (const std::string& script, const std::string& var);
///< if var does not exist, returns 0
/// @note var needs to be in lowercase
void write (ESM::Locals& locals, const std::string& script) const; void write (ESM::Locals& locals, const std::string& script) const;