thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DREAMWEB: Fix regressions in 'intro1text', 'redrawmainscrn', 'sitdowninbar'

Browse source
This commit is contained in:
Willem Jan Palenstijn 2011-12-06 19:02:23 +01:00
parent 16c9620dba
commit 7a3360e09f
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/dreamweb/sprite.cpp
View file

@ -746,7 +746,7 @@ void DreamGenContext::intro1Text() {
if (data.byte(kIntrocount) != 2 && data.byte(kIntrocount) != 4 && data.byte(kIntrocount) != 6) if (data.byte(kIntrocount) != 2 && data.byte(kIntrocount) != 4 && data.byte(kIntrocount) != 6)
return; return;
if (isCD() && data.byte(kCh1playing) == 255) { if (isCD() && data.byte(kCh1playing) != 255) {
data.byte(kIntrocount)--; data.byte(kIntrocount)--;
} else { } else {
if (data.byte(kIntrocount) == 2) if (data.byte(kIntrocount) == 2)

5
engines/dreamweb/stubs.cpp
View file

@ -3558,10 +3558,9 @@ void DreamGenContext::redrawMainScrn() {
} }
void DreamGenContext::selectSlot2() { void DreamGenContext::selectSlot2() {
if (data.word(kMousebutton) == 0) if (data.word(kMousebutton))
selectSlot();
else
data.byte(kLoadingorsave) = 2; data.byte(kLoadingorsave) = 2;
selectSlot();
} }
void DreamGenContext::blank() { void DreamGenContext::blank() {

2
engines/dreamweb/use.cpp
View file

@ -397,7 +397,7 @@ void DreamGenContext::useChurchHole() {
} }
void DreamGenContext::sitDownInBar() { void DreamGenContext::sitDownInBar() {
if (data.byte(kWatchmode) == 0xFF) { if (data.byte(kWatchmode) != 0xFF) {
// Sat down // Sat down
showSecondUse(); showSecondUse();
putBackObStuff(); putBackObStuff();