aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/sfuncs.cpp
diff options
context:
space:
mode:
authorMax Horn2009-04-11 21:38:41 +0000
committerMax Horn2009-04-11 21:38:41 +0000
commit41bd7cd94b6c26ea06da5a2f3f0aefdf4adc5c90 (patch)
treea290f4f777a914b015b90198f023b4de1a540f8f /engines/saga/sfuncs.cpp
parent82f862c6b20de0f2449eb012d4a26e371d87dd52 (diff)
downloadscummvm-rg350-41bd7cd94b6c26ea06da5a2f3f0aefdf4adc5c90.tar.gz
scummvm-rg350-41bd7cd94b6c26ea06da5a2f3f0aefdf4adc5c90.tar.bz2
scummvm-rg350-41bd7cd94b6c26ea06da5a2f3f0aefdf4adc5c90.zip
SAGA: changed _threadList back to a list of ScriptThread objs, instead of ptrs to instances.
svn-id: r39944
Diffstat (limited to 'engines/saga/sfuncs.cpp')
-rw-r--r--engines/saga/sfuncs.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp
index 3010fb696d..4c44aa2bdd 100644
--- a/engines/saga/sfuncs.cpp
+++ b/engines/saga/sfuncs.cpp
@@ -394,15 +394,14 @@ void Script::sfPreDialog(SCRIPTFUNC_PARAMS) {
// Script function #13 (0x0D)
void Script::sfKillActorThreads(SCRIPTFUNC_PARAMS) {
- ScriptThread *anotherThread;
ScriptThreadList::iterator threadIterator;
int16 actorId = thread->pop();
for (threadIterator = _threadList.begin(); threadIterator != _threadList.end(); ++threadIterator) {
- anotherThread = *threadIterator;
- if ((anotherThread != thread) && (anotherThread->_threadVars[kThreadVarActor] == actorId)) {
- anotherThread->_flags &= ~kTFlagWaiting;
- anotherThread->_flags |= kTFlagAborted;
+ ScriptThread &anotherThread = *threadIterator;
+ if ((&anotherThread != thread) && (anotherThread._threadVars[kThreadVarActor] == actorId)) {
+ anotherThread._flags &= ~kTFlagWaiting;
+ anotherThread._flags |= kTFlagAborted;
}
}
}