[Scummvm-cvs-logs] scummvm master -> 7a3360e09fbf529b17d194358c393e30ce86593f

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7a3360e09f DREAMWEB: Fix regressions in 'intro1text', 'redrawmainscrn', 'sitdowninbar'


Commit: 7a3360e09fbf529b17d194358c393e30ce86593f
    https://github.com/scummvm/scummvm/commit/7a3360e09fbf529b17d194358c393e30ce86593f
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-06T10:31:14-08:00

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

Changed paths:
    engines/dreamweb/sprite.cpp
    engines/dreamweb/stubs.cpp
    engines/dreamweb/use.cpp



diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 5d172fd..a7497a7 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 5a769e0..a06e2fc 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 c70c625..2f7e66c 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();