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

Fixed OP_STORE_FIELD and OP_STORE_FIELD_REF

Browse source
This commit is contained in:
smallmodel 2023-08-17 16:07:38 +02:00
parent 56fba733f3
commit 911d1f1706
No known key found for this signature in database
GPG key ID: A96F163ED4891440
2 changed files with 52 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

73
code/script/scriptvm.cpp
View file

@ -470,6 +470,11 @@ void ScriptVM::loadStoreTop(Listener* listener)
}
}
void ScriptVM::skipField()
{
m_CodePos += sizeof(unsigned int);
}
template<>
void ScriptVM::loadTop<false>(Listener *listener)
{
@ -1483,32 +1488,56 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
break;
case OP_STORE_FIELD_REF:
{
try
{
Listener* listener = m_VMStack.GetTop().listenerValue();
if (listener == nullptr)
{
const op_name_t fieldName = fetchActualOpcodeValue<op_name_t>();
skipField();
ScriptError("Field '%s' applied to NULL listener", value.c_str());
}
else
{
ScriptVariable* const listenerVar = storeTop<true>(listener);
if (listenerVar)
{
// having a listener variable means the variable was just created
m_VMStack.GetTop().setRefValue(listenerVar);
}
}
}
catch (...)
{
ScriptVariable* const pTop = m_VMStack.GetTopPtr();
pTop->setRefValue(pTop);
throw;
}
break;
}
case OP_STORE_FIELD:
try {
value = Director.GetString(*reinterpret_cast<int *>(m_CodePos));
try
{
Listener* listener = m_VMStack.GetTop().listenerValue();
listener = m_VMStack.GetTop().listenerValue();
if (listener == NULL) {
ScriptError("Field '%s' applied to NULL listener", value.c_str());
} else {
eventCalled = true;
if (listener == nullptr)
{
ScriptError("Field '%s' applied to NULL listener", value.c_str());
}
else
{
storeTop<true>(listener);
}
if (*opcode == OP_STORE_FIELD_REF) {
m_VMStack.GetTop().setRefValue(listener->vars->GetOrCreateVariable(value));
}
} catch (ScriptException& exc) {
if (*opcode == OP_STORE_FIELD_REF) {
m_VMStack.GetTop().setRefValue(m_VMStack.GetTopPtr());
}
if (!eventCalled) {
m_CodePos += sizeof(unsigned int);
}
throw exc;
break;
}
catch (...)
{
skipField();
throw;
}
break;