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 script class being always created even when a thread was started in the same group

Browse source
This commit is contained in:
smallmodel 2023-10-26 20:08:09 +02:00
parent fb4bf4fcaa
commit b291ab92b6
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
code/script/scriptclass.cpp
View file

@ -160,13 +160,10 @@ ScriptThread *ScriptClass::CreateThreadInternal(const ScriptVariable& label)
ScriptThread *thread = NULL;
if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
ScriptClass *scriptClass = Director.CurrentScriptClass();
scr = scriptClass->GetScript();
if (label.GetType() == VARIABLE_CONSTSTRING) {
thread = Director.CreateScriptThread(scr, m_Self, label.constStringValue());
thread = Director.CreateScriptThread(this, label.constStringValue());
} else {
thread = Director.CreateScriptThread(scr, m_Self, label.stringValue());
thread = Director.CreateScriptThread(this, label.stringValue());
}
} else if (label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1) {
ScriptVariable *script = label[1];
@ -179,9 +176,9 @@ ScriptThread *ScriptClass::CreateThreadInternal(const ScriptVariable& label)
}
if (labelname->GetType() == VARIABLE_CONSTSTRING) {
thread = Director.CreateScriptThread(scr, m_Self, labelname->constStringValue());
thread = Director.CreateScriptThread(scr, GetSelf(), labelname->constStringValue());
} else {
thread = Director.CreateScriptThread(scr, m_Self, labelname->stringValue());
thread = Director.CreateScriptThread(scr, GetSelf(), labelname->stringValue());
}
} else {
ScriptError("ScriptClass::CreateThreadInternal: bad argument format");
@ -202,10 +199,11 @@ ScriptThread *ScriptClass::CreateScriptInternal(const ScriptVariable& label)
if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
if (label.GetType() == VARIABLE_CONSTSTRING) {
thread = Director.CreateScriptThread(Director.GetGameScript(label.stringValue()), m_Self, "");
scr = Director.GetGameScript(label.constStringValue());
} else {
thread = Director.CreateScriptThread(Director.GetGameScript(label.constStringValue()), m_Self, "");
scr = Director.GetGameScript(label.stringValue());
}
thread = Director.CreateScriptThread(scr, GetSelf(), "");
} else if (label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1) {
ScriptVariable *script = label[1];
ScriptVariable *labelname = label[2];
@ -217,9 +215,9 @@ ScriptThread *ScriptClass::CreateScriptInternal(const ScriptVariable& label)
}
if (labelname->GetType() == VARIABLE_CONSTSTRING) {
thread = Director.CreateScriptThread(scr, m_Self, labelname->constStringValue());
thread = Director.CreateScriptThread(scr, GetSelf(), labelname->constStringValue());
} else {
thread = Director.CreateScriptThread(scr, m_Self, labelname->stringValue());
thread = Director.CreateScriptThread(scr, GetSelf(), labelname->stringValue());
}
} else {
ScriptError("ScriptClass::CreateScriptInternal: bad label type '%s'", label.GetTypeName());
@ -246,22 +244,22 @@ KillThreads
*/
void ScriptClass::KillThreads()
{
ScriptVM *thread;
ScriptVM *next;
if (!m_Threads) {
return;
}
ScriptVM *m_current;
ScriptVM *m_next;
for (thread = m_Threads; thread; thread = next) {
if (g_scripttrace->integer && thread->CanScriptTracePrint()) {
gi.DPrintf2("---KILLTHREADS THREAD: %p\n", thread);
}
m_current = m_Threads;
do {
m_current->m_ScriptClass = NULL;
m_next = m_current->next;
delete m_current->m_Thread;
} while ((m_current = m_next) != nullptr);
thread->m_ScriptClass = NULL;
next = thread->next;
delete thread->m_Thread;
}
m_Threads = NULL;
}