diff options
author | Willem Jan Palenstijn | 2011-12-06 19:02:23 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2011-12-06 19:31:14 +0100 |
commit | 7a3360e09fbf529b17d194358c393e30ce86593f (patch) | |
tree | f0b8d1cd09324e8e1c57ee8f756684d163086d0c | |
parent | 16c9620dbad66d7c1f2bc5f4d172393c34b92371 (diff) | |
download | scummvm-rg350-7a3360e09fbf529b17d194358c393e30ce86593f.tar.gz scummvm-rg350-7a3360e09fbf529b17d194358c393e30ce86593f.tar.bz2 scummvm-rg350-7a3360e09fbf529b17d194358c393e30ce86593f.zip |
DREAMWEB: Fix regressions in 'intro1text', 'redrawmainscrn', 'sitdowninbar'
-rw-r--r-- | engines/dreamweb/sprite.cpp | 2 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 5 | ||||
-rw-r--r-- | engines/dreamweb/use.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index 5d172fd295..a7497a7fd0 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -746,7 +746,7 @@ void DreamGenContext::intro1Text() { if (data.byte(kIntrocount) != 2 && data.byte(kIntrocount) != 4 && data.byte(kIntrocount) != 6) return; - if (isCD() && data.byte(kCh1playing) == 255) { + if (isCD() && data.byte(kCh1playing) != 255) { data.byte(kIntrocount)--; } else { if (data.byte(kIntrocount) == 2) diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 5a769e05b5..a06e2fcae0 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -3558,10 +3558,9 @@ void DreamGenContext::redrawMainScrn() { } void DreamGenContext::selectSlot2() { - if (data.word(kMousebutton) == 0) - selectSlot(); - else + if (data.word(kMousebutton)) data.byte(kLoadingorsave) = 2; + selectSlot(); } void DreamGenContext::blank() { diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp index c70c625969..2f7e66c840 100644 --- a/engines/dreamweb/use.cpp +++ b/engines/dreamweb/use.cpp @@ -397,7 +397,7 @@ void DreamGenContext::useChurchHole() { } void DreamGenContext::sitDownInBar() { - if (data.byte(kWatchmode) == 0xFF) { + if (data.byte(kWatchmode) != 0xFF) { // Sat down showSecondUse(); putBackObStuff(); |