aboutsummaryrefslogtreecommitdiff
path: root/engines/illusions/threads
diff options
context:
space:
mode:
authorEric Fry2018-06-26 22:35:31 +1000
committerEugene Sandulenko2018-07-20 06:43:33 +0000
commit989d8d9b8abecee3f0b72c92a05067e128fc6cdd (patch)
tree6879c75dccd45e4ae6f2396ee62425f625494f37 /engines/illusions/threads
parent7cadb7ad0ce7b24c28d3fa9d842f7083ae5b9056 (diff)
downloadscummvm-rg350-989d8d9b8abecee3f0b72c92a05067e128fc6cdd.tar.gz
scummvm-rg350-989d8d9b8abecee3f0b72c92a05067e128fc6cdd.tar.bz2
scummvm-rg350-989d8d9b8abecee3f0b72c92a05067e128fc6cdd.zip
ILLUSIONS: Formatting, remove trailing whitespace.
Diffstat (limited to 'engines/illusions/threads')
-rw-r--r--engines/illusions/threads/abortablethread.cpp2
-rw-r--r--engines/illusions/threads/talkthread.cpp8
-rw-r--r--engines/illusions/threads/talkthread_duckman.cpp10
3 files changed, 10 insertions, 10 deletions
diff --git a/engines/illusions/threads/abortablethread.cpp b/engines/illusions/threads/abortablethread.cpp
index d2fc8076ff..84cd84090e 100644
--- a/engines/illusions/threads/abortablethread.cpp
+++ b/engines/illusions/threads/abortablethread.cpp
@@ -31,7 +31,7 @@ namespace Illusions {
AbortableThread::AbortableThread(IllusionsEngine *vm, uint32 threadId, uint32 callingThreadId, uint notifyFlags,
uint32 scriptThreadId, byte *scriptCodeIp)
- : Thread(vm, threadId, callingThreadId, notifyFlags), _scriptThreadId(scriptThreadId),
+ : Thread(vm, threadId, callingThreadId, notifyFlags), _scriptThreadId(scriptThreadId),
_scriptCodeIp(scriptCodeIp), _status(1) {
_type = kTTAbortableThread;
_sceneId = _vm->getCurrentScene();
diff --git a/engines/illusions/threads/talkthread.cpp b/engines/illusions/threads/talkthread.cpp
index 9e94ef64cc..d20f94a164 100644
--- a/engines/illusions/threads/talkthread.cpp
+++ b/engines/illusions/threads/talkthread.cpp
@@ -57,9 +57,9 @@ TalkThread::TalkThread(IllusionsEngine *vm, uint32 threadId, uint32 callingThrea
_status = 2;
else
_status = 3;
-
+
_flags = 0x0E;
-
+
_durationMult = _vm->clipTextDuration(_vm->getSubtitleDuration());
_textDuration = _durationMult;
_defDurationMult = _vm->clipTextDuration(240);
@@ -135,7 +135,7 @@ int TalkThread::onUpdate() {
return kTSYield;
_status = 5;
// Fallthrough to status 5
-
+
case 5:
if (!(_flags & 8))
refreshText();
@@ -239,7 +239,7 @@ if (true) {
return kTSTerminate;
}
-
+
return kTSTerminate;
}
diff --git a/engines/illusions/threads/talkthread_duckman.cpp b/engines/illusions/threads/talkthread_duckman.cpp
index fdfcc0ac4f..a2e9ebaec6 100644
--- a/engines/illusions/threads/talkthread_duckman.cpp
+++ b/engines/illusions/threads/talkthread_duckman.cpp
@@ -55,11 +55,11 @@ TalkThread_Duckman::TalkThread_Duckman(IllusionsEngine_Duckman *vm, uint32 threa
_status = 1;
else
_status = 2;
-
+
_durationMult = _vm->clipTextDuration(_vm->_subtitleDuration);
_textDuration = _durationMult;
_defDurationMult = _vm->clipTextDuration(240);
-
+
_sceneId = _vm->getCurrentScene();
}
@@ -101,14 +101,14 @@ int TalkThread_Duckman::onUpdate() {
if (_objectId == 0 || _durationMult == 0)
_flags |= 8;
_status = 3;
- // Fallthrough to status 3
+ // Fallthrough to status 3
case 3:
if (!(_flags & 4) && !_vm->_soundMan->isVoiceCued())
return kTSYield;
_status = 4;
// Fallthrough to status 4
-
+
case 4:
if (!(_flags & 8) ) {
uint32 actorTypeId = _vm->getObjectActorTypeId(_objectId);
@@ -196,7 +196,7 @@ int TalkThread_Duckman::onUpdate() {
_flags |= 2;
}
return kTSTerminate;
-
+
}
return kTSTerminate;