aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage
diff options
context:
space:
mode:
authorStrangerke2014-02-01 18:16:58 +0100
committerStrangerke2014-02-01 18:16:58 +0100
commit6087df91be06ea4db065b02afb573a338a06be18 (patch)
treebd1a91b67fe92ba98cb06dc8127aecb261fe7fa8 /engines/tsage
parentc50487a0e685901a00f7e8e06c45733403badc3a (diff)
downloadscummvm-rg350-6087df91be06ea4db065b02afb573a338a06be18.tar.gz
scummvm-rg350-6087df91be06ea4db065b02afb573a338a06be18.tar.bz2
scummvm-rg350-6087df91be06ea4db065b02afb573a338a06be18.zip
TSAGE: R2R - Get rid of some magic values, fix an unnoticed bug
Diffstat (limited to 'engines/tsage')
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes0.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 9b5e6758f5..ee63cad812 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1678,7 +1678,7 @@ void Scene180::signal() {
case 24:
case 26:
case 46:
- setSceneDelay((R2_GLOBALS._speechSubtitles & 1) ? 1 : 18);
+ setSceneDelay((R2_GLOBALS._speechSubtitles & SPEECH_TEXT) ? 1 : 18);
break;
case 13:
@@ -4313,7 +4313,7 @@ void Scene325::signal() {
if (_soundCount)
--_soundCount;
- if (!_soundCount || (R2_GLOBALS._speechSubtitles == 2)) {
+ if (!_soundCount || !(R2_GLOBALS._speechSubtitles & SPEECH_VOICE)) {
_soundIndex = 0;
R2_GLOBALS._playStream.stop();
} else {
@@ -4700,7 +4700,7 @@ void Scene325::setMessage(int resNum, int lineNum) {
R2_GLOBALS._sceneObjects->draw();
- if ((_soundCount != 0) && (R2_GLOBALS._speechSubtitles != 2)) {
+ if ((_soundCount != 0) && (R2_GLOBALS._speechSubtitles & SPEECH_VOICE)) {
_sceneMode = 15;
R2_GLOBALS._playStream.play(_soundQueue[_soundIndex++], this);
}