[Scummvm-cvs-logs] scummvm master -> 1d0ba8e8e6cb9cb6ec20492972d2b0b06c349c06

bluegr md5 at scummvm.org
Thu Dec 8 11:19:29 CET 2011


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:
1d0ba8e8e6 DREAMWEB: Port 'showcooker' to C++


Commit: 1d0ba8e8e6cb9cb6ec20492972d2b0b06c349c06
    https://github.com/scummvm/scummvm/commit/1d0ba8e8e6cb9cb6ec20492972d2b0b06c349c06
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-08T02:18:52-08:00

Commit Message:
DREAMWEB: Port 'showcooker' to C++

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/stubs.h
    engines/dreamweb/use.cpp



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index bf24486..c157ef3 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -670,6 +670,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'usechurchgate',
 	'usechurchhole',
 	'useclearbox',
+	'usecooker',
 	'usecoveredbox',
 	'usedryer',
 	'useelevator1',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d5d1e18..fed9eef 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -5088,22 +5088,6 @@ stereoon:
 	putBackObStuff();
 }
 
-void DreamGenContext::useCooker() {
-	STACK_CHECK;
-	al = data.byte(kCommand);
-	ah = data.byte(kObjecttype);
-	checkInside();
-	_cmp(cl, (114));
-	if (!flags.z())
-		goto foodinside;
-	showFirstUse();
-	putBackObStuff();
-	return;
-foodinside:
-	showSecondUse();
-	putBackObStuff();
-}
-
 void DreamGenContext::useAxe() {
 	STACK_CHECK;
 	_cmp(data.byte(kReallocation), 22);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index fcbc61e..56c7aa6 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -613,7 +613,6 @@ public:
 	void rollEndCredits();
 	void getKeyAndLogo();
 	void selectOb();
-	void useCooker();
 	void receptionist();
 	void selectSlot();
 	void decide();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index e8969f2..8b709d8 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -369,6 +369,7 @@
 	void useCardReader2();
 	void useCardReader3();
 	void usePoolReader();
+	void useCooker();
 	bool defaultUseHandler(const char *id);
 	void openTVDoor();
 	void wearWatch();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 044a4fb..b56ae07 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1137,4 +1137,17 @@ void DreamGenContext::hotelControl() {
 	putBackObStuff();
 }
 
+void DreamGenContext::useCooker() {
+	al = data.byte(kCommand);
+	ah = data.byte(kObjecttype);
+	checkInside();
+
+	if (cl == 114)
+		showFirstUse();
+	else
+		showSecondUse();	// Food inside
+		
+	putBackObStuff();
+}
+
 } // End of namespace DreamGen






More information about the Scummvm-git-logs mailing list