[Scummvm-cvs-logs] scummvm master -> 6d2723400662c2b7d75bf6317807770b4d370caf

[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:
6d27234006 DREAMWEB: Fix regression in usePipe


Commit: 6d2723400662c2b7d75bf6317807770b4d370caf
    https://github.com/scummvm/scummvm/commit/6d2723400662c2b7d75bf6317807770b4d370caf
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-12T14:48:49-08:00

Commit Message:
DREAMWEB: Fix regression in usePipe

Changed paths:
    engines/dreamweb/use.cpp



diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 531f465..f62daf9 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1332,11 +1332,11 @@ void DreamGenContext::usePipe() {
 		return;
 	} else if (compare(data.byte(kWithobject), data.byte(kWithtype), cupFull)) {
 		// Already full
-		showPuzText(14, 300);
-		showPuzText();
+		showPuzText(35, 300);
 		putBackObStuff();
 	} else {
-		showPuzText(35, 300);
+		showPuzText(14, 300);
+		showPuzText();
 		putBackObStuff();
 	}
 }
@@ -1385,8 +1385,6 @@ void DreamGenContext::useAxe() {
 
 	if (data.byte(kMapy) == 10) {
 		// Axe on door
-		al = 15;
-		cx = 300;
 		showPuzText(15, 300);
 		data.byte(kProgresspoints)++;
 		data.word(kWatchingtime) = 46*2;