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

Rework the target list, use a container instead of an hash set so the target list gets archived correctly

Browse source 
This fixes an issue when loading from a save. A variable referencing target list container would have random entities in it, which would cause errors and crashes when trying to do an action on the array of entities
This commit is contained in:
smallmodel 2024-10-22 20:05:53 +02:00 • committed by GitHub
parent 590b3f5cbb
commit 3d454c90cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 155 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

14
code/script/scriptvm.cpp
View file

@ -1007,7 +1007,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
Event ev;
ScriptVariable *var = NULL;
ConSimple *targetList;
TargetList *targetList;
if (Director.stackCount >= MAX_STACK_DEPTH) {
state = STATE_EXECUTION;
@ -1769,9 +1769,9 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
case OP_UN_TARGETNAME:
// retrieve the target name
targetList = world->GetExistingTargetList(m_VMStack.GetTop().constStringValue());
targetList = world->GetExistingTargetList(m_VMStack.GetTop().stringValue());
if (!targetList || !targetList->NumObjects()) {
if (!targetList || !targetList->list.NumObjects()) {
str targetname = m_VMStack.GetTop().stringValue();
// the target name was not found
m_VMStack.GetTop().setListenerValue(NULL);
@ -1780,12 +1780,12 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
|| (*m_PrevCodePos >= OP_BOOL_UN_NOT && *m_PrevCodePos <= OP_UN_CAST_BOOLEAN)) {
ScriptError("Targetname '%s' does not exist.", targetname.c_str());
}
} else if (targetList->NumObjects() == 1) {
} else if (targetList->list.NumObjects() == 1) {
// single listener
m_VMStack.GetTop().setListenerValue(targetList->ObjectAt(1));
} else if (targetList->NumObjects() > 1) {
m_VMStack.GetTop().setListenerValue(targetList->list.ObjectAt(1));
} else if (targetList->list.NumObjects() > 1) {
// multiple listeners
m_VMStack.GetTop().setContainerValue((Container<SafePtr<Listener>> *)targetList);
m_VMStack.GetTop().setContainerValue((Container<SafePtr<Listener>> *)&targetList->list);
}
break;