From 04c79d5f1ec1175afc32e6f762d2fa4e4c632189 Mon Sep 17 00:00:00 2001 From: scrawl Date: Thu, 11 Sep 2014 19:20:04 +0200 Subject: [PATCH] Fix case issue when setting companion's profit on the script --- apps/openmw/mwgui/companionwindow.cpp | 2 +- apps/openmw/mwscript/locals.hpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp index 4ea2a44c7..7b6644c6b 100644 --- a/apps/openmw/mwgui/companionwindow.cpp +++ b/apps/openmw/mwgui/companionwindow.cpp @@ -148,7 +148,7 @@ void CompanionWindow::onMessageBoxButtonClicked(int button) if (button == 0) { 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().getDialogueManager()->startDialogue (mPtr); diff --git a/apps/openmw/mwscript/locals.hpp b/apps/openmw/mwscript/locals.hpp index 1e8c6e12a..9fa4214ac 100644 --- a/apps/openmw/mwscript/locals.hpp +++ b/apps/openmw/mwscript/locals.hpp @@ -24,8 +24,11 @@ namespace MWScript bool isEmpty() const; 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); - 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;