From 2cb16e778c6813bacd905395ea4e5158e0cc171e Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sun, 26 Jul 2020 20:03:33 +0200 Subject: [PATCH] [General] Use clearer method name for tracking InterpreterContext type --- apps/openmw/engine.cpp | 2 +- apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 2 +- apps/openmw/mwgui/console.cpp | 2 +- apps/openmw/mwscript/globalscripts.cpp | 2 +- apps/openmw/mwscript/interpretercontext.cpp | 4 ++-- apps/openmw/mwscript/interpretercontext.hpp | 4 ++-- components/interpreter/context.hpp | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 395a2e027..a89f44b9a 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -251,7 +251,7 @@ void OMW::Engine::executeLocalScripts() so that packets sent by the Interpreter can have their origin determined by serverside scripts */ - interpreterContext.setContextType(Interpreter::Context::SCRIPT_LOCAL); + interpreterContext.trackContextType(Interpreter::Context::SCRIPT_LOCAL); /* End of tes3mp addition */ diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp index 559f4d62a..e6bd5bdf4 100644 --- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp +++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp @@ -262,7 +262,7 @@ namespace MWDialogue so that packets sent by the Interpreter can have their origin determined by serverside scripts */ - interpreterContext.setContextType(Interpreter::Context::DIALOGUE); + interpreterContext.trackContextType(Interpreter::Context::DIALOGUE); /* End of tes3mp addition */ diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp index a33da8802..5f502ff07 100644 --- a/apps/openmw/mwgui/console.cpp +++ b/apps/openmw/mwgui/console.cpp @@ -216,7 +216,7 @@ namespace MWGui so that packets sent by the Interpreter can have their origin determined by serverside scripts */ - interpreterContext.setContextType(Interpreter::Context::CONSOLE); + interpreterContext.trackContextType(Interpreter::Context::CONSOLE); mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); objectList->reset(); diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp index 9d049c31e..e789e34da 100644 --- a/apps/openmw/mwscript/globalscripts.cpp +++ b/apps/openmw/mwscript/globalscripts.cpp @@ -178,7 +178,7 @@ namespace MWScript so that packets sent by the Interpreter can have their origin determined by serverside scripts */ - context.setContextType(Interpreter::Context::SCRIPT_GLOBAL); + context.trackContextType(Interpreter::Context::SCRIPT_GLOBAL); /* End of tes3mp addition */ diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp index 795bc591b..994b420c9 100644 --- a/apps/openmw/mwscript/interpretercontext.cpp +++ b/apps/openmw/mwscript/interpretercontext.cpp @@ -45,14 +45,14 @@ namespace MWScript /* Start of tes3mp addition - Used for setting and checking the type of this InterpreterContext + Used for tracking and checking the type of this InterpreterContext */ unsigned short InterpreterContext::getContextType() const { return mContextType; } - void InterpreterContext::setContextType(unsigned short contextType) + void InterpreterContext::trackContextType(unsigned short contextType) { mContextType = contextType; } diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp index eedbbff3b..7280b70ac 100644 --- a/apps/openmw/mwscript/interpretercontext.hpp +++ b/apps/openmw/mwscript/interpretercontext.hpp @@ -71,13 +71,13 @@ namespace MWScript /* Start of tes3mp addition - Used for setting and checking the type of this InterpreterContext + Used for tracking and checking the type of this InterpreterContext */ unsigned short mContextType; virtual unsigned short getContextType() const; - virtual void setContextType(unsigned short contextType); + virtual void trackContextType(unsigned short contextType); /* End of tes3mp addition */ diff --git a/components/interpreter/context.hpp b/components/interpreter/context.hpp index b98388d14..4667c86db 100644 --- a/components/interpreter/context.hpp +++ b/components/interpreter/context.hpp @@ -109,10 +109,10 @@ namespace Interpreter /* Start of tes3mp addition - Used for setting and checking the type of this Context + Used for tracking and checking the type of this Context */ virtual unsigned short getContextType() const = 0; - virtual void setContextType(unsigned short interpreterType) = 0; + virtual void trackContextType(unsigned short interpreterType) = 0; /* End of tes3mp addition */