aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-11-16 20:26:52 +0100
committerWillem Jan Palenstijn2011-11-16 20:50:14 +0100
commitc27367c33f933bd3c0456e0952d3413c69dc7d86 (patch)
tree5f1b0c401e100bc844b39f0e046d66c3806d8479 /engines
parente0496d43261c3f25897013593e5bf1e9ef8b67d6 (diff)
downloadscummvm-rg350-c27367c33f933bd3c0456e0952d3413c69dc7d86.tar.gz
scummvm-rg350-c27367c33f933bd3c0456e0952d3413c69dc7d86.tar.bz2
scummvm-rg350-c27367c33f933bd3c0456e0952d3413c69dc7d86.zip
DREAMWEB: Add missing CD checks in 'textforend' and 'textformonk'
Diffstat (limited to 'engines')
-rw-r--r--engines/dreamweb/sprite.cpp26
1 files changed, 15 insertions, 11 deletions
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index a267094e1f..dfbbbafd1c 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1031,7 +1031,7 @@ void DreamGenContext::textforend() {
cx = 60;
goto gotendtext;
notendtext1:
- _cmp(data.byte(kIntrocount), 50);
+ _cmp(data.byte(kIntrocount), (isCD() ? 50 : 65));
if (!flags.z())
goto notendtext2;
al = 1;
@@ -1040,7 +1040,7 @@ notendtext1:
cx = 60;
goto gotendtext;
notendtext2:
- _cmp(data.byte(kIntrocount), 85);
+ _cmp(data.byte(kIntrocount), (isCD() ? 85 : 110));
if (!flags.z())
return /* (notendtext3) */;
al = 2;
@@ -1093,7 +1093,7 @@ notmonktext3:
cx = 120;
goto gotmonktext;
notmonktext4:
- _cmp(data.byte(kIntrocount), 15);
+ _cmp(data.byte(kIntrocount), (isCD() ? 15 : 17));
if (!flags.z())
goto notmonktext5;
al = 23;
@@ -1165,7 +1165,7 @@ notmonktext11:
cx = 120;
goto gotmonktext;
notmonktext12:
- _cmp(data.byte(kIntrocount), 52);
+ _cmp(data.byte(kIntrocount), (isCD() ? 52 : 49));
if (!flags.z())
goto notmonktext13;
al = 31;
@@ -1178,17 +1178,21 @@ notmonktext13:
if (!flags.z())
return /* (notendtitles) */;
fadescreendowns();
- data.byte(kVolumeto) = 7;
- data.byte(kVolumedirection) = 1;
+ if (isCD()) {
+ data.byte(kVolumeto) = 7;
+ data.byte(kVolumedirection) = 1;
+ }
return;
gotmonktext:
dx = 1;
ah = 82;
- _cmp(data.byte(kCh1playing), 255);
- if (flags.z())
- goto oktalk;
- _dec(data.byte(kIntrocount));
- return;
+ if (isCD()) {
+ _cmp(data.byte(kCh1playing), 255);
+ if (flags.z())
+ goto oktalk;
+ _dec(data.byte(kIntrocount));
+ return;
+ }
oktalk:
setuptimedtemp();
}