DREAMWEB: Add missing CD checks in 'textforend' and 'textformonk'

This commit is contained in:
Willem Jan Palenstijn 2011-11-16 20:26:52 +01:00
parent e0496d4326
commit c27367c33f

View file

@ -1031,7 +1031,7 @@ void DreamGenContext::textforend() {
cx = 60; cx = 60;
goto gotendtext; goto gotendtext;
notendtext1: notendtext1:
_cmp(data.byte(kIntrocount), 50); _cmp(data.byte(kIntrocount), (isCD() ? 50 : 65));
if (!flags.z()) if (!flags.z())
goto notendtext2; goto notendtext2;
al = 1; al = 1;
@ -1040,7 +1040,7 @@ notendtext1:
cx = 60; cx = 60;
goto gotendtext; goto gotendtext;
notendtext2: notendtext2:
_cmp(data.byte(kIntrocount), 85); _cmp(data.byte(kIntrocount), (isCD() ? 85 : 110));
if (!flags.z()) if (!flags.z())
return /* (notendtext3) */; return /* (notendtext3) */;
al = 2; al = 2;
@ -1093,7 +1093,7 @@ notmonktext3:
cx = 120; cx = 120;
goto gotmonktext; goto gotmonktext;
notmonktext4: notmonktext4:
_cmp(data.byte(kIntrocount), 15); _cmp(data.byte(kIntrocount), (isCD() ? 15 : 17));
if (!flags.z()) if (!flags.z())
goto notmonktext5; goto notmonktext5;
al = 23; al = 23;
@ -1165,7 +1165,7 @@ notmonktext11:
cx = 120; cx = 120;
goto gotmonktext; goto gotmonktext;
notmonktext12: notmonktext12:
_cmp(data.byte(kIntrocount), 52); _cmp(data.byte(kIntrocount), (isCD() ? 52 : 49));
if (!flags.z()) if (!flags.z())
goto notmonktext13; goto notmonktext13;
al = 31; al = 31;
@ -1178,17 +1178,21 @@ notmonktext13:
if (!flags.z()) if (!flags.z())
return /* (notendtitles) */; return /* (notendtitles) */;
fadescreendowns(); fadescreendowns();
if (isCD()) {
data.byte(kVolumeto) = 7; data.byte(kVolumeto) = 7;
data.byte(kVolumedirection) = 1; data.byte(kVolumedirection) = 1;
}
return; return;
gotmonktext: gotmonktext:
dx = 1; dx = 1;
ah = 82; ah = 82;
if (isCD()) {
_cmp(data.byte(kCh1playing), 255); _cmp(data.byte(kCh1playing), 255);
if (flags.z()) if (flags.z())
goto oktalk; goto oktalk;
_dec(data.byte(kIntrocount)); _dec(data.byte(kIntrocount));
return; return;
}
oktalk: oktalk:
setuptimedtemp(); setuptimedtemp();
} }