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

[Client] Record type of each InterpreterContext for later checking

Browse source
This commit is contained in:
David Cernat 2018-07-23 00:46:07 +03:00
parent d4a84ac34a
commit 63a86f145d
7 changed files with 109 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/engine.cpp
View file

@ -104,6 +104,18 @@ void OMW::Engine::executeLocalScripts()
End of tes3mp addition
*/
/*
Start of tes3mp addition
Mark this InterpreterContext as having a CONSOLE context,
so that packets sent by the Interpreter can have their
origin determined by serverside scripts
*/
interpreterContext.setContextType(Interpreter::Context::SCRIPT_LOCAL);
/*
End of tes3mp addition
*/
mEnvironment.getScriptManager()->run (script.first, interpreterContext);
}
}

13
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View file

@ -262,6 +262,19 @@ namespace MWDialogue
try
{
MWScript::InterpreterContext interpreterContext(&actor.getRefData().getLocals(), actor);
/*
Start of tes3mp addition
Mark this InterpreterContext as having a CONSOLE context,
so that packets sent by the Interpreter can have their
origin determined by serverside scripts
*/
interpreterContext.setContextType(Interpreter::Context::DIALOGUE);
/*
End of tes3mp addition
*/
Interpreter::Interpreter interpreter;
MWScript::installOpcodes (interpreter);
interpreter.run (&code[0], code.size(), interpreterContext);

13
apps/openmw/mwgui/console.cpp
View file

@ -186,6 +186,19 @@ namespace MWGui
try
{
ConsoleInterpreterContext interpreterContext (*this, mPtr);
/*
Start of tes3mp addition
Mark this InterpreterContext as having a CONSOLE context,
so that packets sent by the Interpreter can have their
origin determined by serverside scripts
*/
interpreterContext.setContextType(Interpreter::Context::CONSOLE);
/*
End of tes3mp addition
*/
Interpreter::Interpreter interpreter;
MWScript::installOpcodes (interpreter, mConsoleOnlyScripts);
std::vector<Interpreter::Type_Code> code;

12
apps/openmw/mwscript/globalscripts.cpp
View file

@ -79,6 +79,18 @@ namespace MWScript
MWScript::InterpreterContext interpreterContext (
&iter->second.mLocals, MWWorld::Ptr(), iter->second.mId);
/*
Start of tes3mp addition
Mark this InterpreterContext as having a GLOBAL_SCRIPT context,
so that packets sent by the Interpreter can have their
origin determined by serverside scripts
*/
interpreterContext.setContextType(Interpreter::Context::SCRIPT_GLOBAL);
/*
End of tes3mp addition
*/
MWBase::Environment::get().getScriptManager()->run (iter->first, interpreterContext);
}
}

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

@ -63,6 +63,24 @@ namespace MWScript
}
}
/*
Start of tes3mp addition
Used for setting and checking the type of this InterpreterContext
*/
unsigned short InterpreterContext::getContextType() const
{
return mContextType;
}
void InterpreterContext::setContextType(unsigned short contextType)
{
mContextType = contextType;
}
/*
End of tes3mp addition
*/
const MWWorld::Ptr InterpreterContext::getReferenceImp (
const std::string& id, bool activeOnly, bool doThrow) const
{

14
apps/openmw/mwscript/interpretercontext.hpp
View file

@ -63,6 +63,20 @@ namespace MWScript
End of tes3mp addition
*/
/*
Start of tes3mp addition
Used for setting and checking the type of this InterpreterContext
*/
unsigned short mContextType;
virtual unsigned short getContextType() const;
virtual void setContextType(unsigned short contextType);
/*
End of tes3mp addition
*/
virtual int getLocalShort (int index) const;
virtual int getLocalLong (int index) const;

27
components/interpreter/context.hpp
View file

@ -10,6 +10,22 @@ namespace Interpreter
{
public:
/*
Start of tes3mp addition
Keep an enumeration of the possible context types
*/
enum CONTEXT_TYPE
{
CONSOLE = 0,
DIALOGUE = 1,
SCRIPT_LOCAL = 2,
SCRIPT_GLOBAL = 3
};
/*
End of tes3mp addition
*/
virtual ~Context() {}
virtual int getLocalShort (int index) const = 0;
@ -110,6 +126,17 @@ namespace Interpreter
= 0;
virtual std::string getTargetId() const = 0;
/*
Start of tes3mp addition
Used for setting and checking the type of this Context
*/
virtual unsigned short getContextType() const = 0;
virtual void setContextType(unsigned short interpreterType) = 0;
/*
End of tes3mp addition
*/
};
}