Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Removed listenerVars as it can cause issues

Browse source
This commit is contained in:
smallmodel 2023-08-17 19:51:53 +02:00
parent 4435984b81
commit 28de2543ec
No known key found for this signature in database
GPG key ID: A96F163ED4891440
2 changed files with 3 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

48
code/script/scriptvm.cpp
View file

@ -89,8 +89,6 @@ ScriptVMStack::ScriptVMStack(size_t stackSize)
localStack = new (data) ScriptVariable[stackSize];
data += sizeof(ScriptVariable) * stackSize;
listenerVarPtr = new (data) ScriptVariable *[stackSize]();
pTop = localStack;
stackBottom = localStack + stackSize;
}
@ -99,11 +97,9 @@ ScriptVMStack::ScriptVMStack(ScriptVMStack&& other)
: localStack(other.localStack)
, stackBottom(other.stackBottom)
, pTop(other.pTop)
, listenerVarPtr(other.listenerVarPtr)
{
other.localStack = other.stackBottom = nullptr;
other.pTop = nullptr;
other.listenerVarPtr = nullptr;
}
ScriptVMStack& ScriptVMStack::operator=(ScriptVMStack&& other)
@ -111,10 +107,8 @@ ScriptVMStack& ScriptVMStack::operator=(ScriptVMStack&& other)
localStack = other.localStack;
stackBottom = other.stackBottom;
pTop = other.pTop;
listenerVarPtr = other.listenerVarPtr;
other.localStack = other.stackBottom = nullptr;
other.pTop = nullptr;
other.listenerVarPtr = nullptr;
return *this;
}
@ -223,16 +217,6 @@ void ScriptVMStack::MoveTop(ScriptVariable&& other)
*pTop = std::move(other);
}
ScriptVariable *ScriptVMStack::GetListenerVar(uintptr_t index)
{
return listenerVarPtr[index];
}
void ScriptVMStack::SetListenerVar(uintptr_t index, ScriptVariable *newVar)
{
listenerVarPtr[index] = newVar;
}
//====================
// ScriptVM
//====================
@ -411,18 +395,8 @@ void ScriptVM::loadTopInternal(Listener *listener)
if (!executeSetter(listener, variable)) {
// just set the variable
const uintptr_t varIndex = m_VMStack.GetIndex();
ScriptVariable& pTop = m_VMStack.GetTop();
if (varIndex < m_VMStack.GetStackSize()) {
ScriptVariable *const listenerVar = m_VMStack.GetListenerVar(varIndex);
if (!listenerVar || listenerVar->GetKey() != short3(variable)) {
listener->Vars()->SetVariable(variable, std::move(pTop));
} else {
*listenerVar = std::move(pTop);
}
} else {
listener->Vars()->SetVariable(variable, std::move(pTop));
}
listener->Vars()->SetVariable(variable, std::move(pTop));
}
}
@ -432,13 +406,8 @@ ScriptVariable *ScriptVM::storeTopInternal(Listener *listener)
ScriptVariable *listenerVar;
if (!executeGetter(listener, variable)) {
const uintptr_t varIndex = m_VMStack.GetIndex();
ScriptVariable& pTop = m_VMStack.GetTop();
listenerVar = m_VMStack.GetListenerVar(varIndex);
if (!listenerVar || listenerVar->GetKey() != short3(variable)) {
listenerVar = listener->Vars()->GetOrCreateVariable(variable);
m_VMStack.SetListenerVar(varIndex, listenerVar);
}
listenerVar = listener->Vars()->GetOrCreateVariable(variable);
pTop = *listenerVar;
} else {
@ -454,19 +423,8 @@ void ScriptVM::loadStoreTop(Listener* listener)
if (!executeSetter(listener, variable)) {
// just set the variable
const uintptr_t varIndex = m_VMStack.GetIndex();
ScriptVariable& pTop = m_VMStack.GetTop();
if (varIndex < m_VMStack.GetStackSize()) {
ScriptVariable* const listenerVar = m_VMStack.GetListenerVar(varIndex);
if (!listenerVar || listenerVar->GetKey() != short3(variable)) {
listener->Vars()->SetVariable(variable, pTop);
} else {
*listenerVar = pTop;
}
}
else {
listener->Vars()->SetVariable(variable, pTop);
}
listener->Vars()->SetVariable(variable, pTop);
}
}