[Scummvm-cvs-logs] scummvm master -> 2bda241f6f9118632aba73df529da29d112ef48d

[bluegr]

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:
2bda241f6f DREAMWEB: 'allpointer', 'blank', 'mode640x480' ported to C++


Commit: 2bda241f6f9118632aba73df529da29d112ef48d
    https://github.com/scummvm/scummvm/commit/2bda241f6f9118632aba73df529da29d112ef48d
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-05T18:33:36-08:00

Commit Message:
DREAMWEB: 'allpointer', 'blank', 'mode640x480' ported to C++

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index a962305..5e39e64 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -152,6 +152,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'allocatebuffers',
 	'allocateload',
 	'allocatework',
+	'allpointer',
 	'animpointer',
 	'atmospheres',
 	'autolook',
@@ -159,6 +160,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'backobject',
 	'barwoman',
 	'biblequote',
+	'blank',
 	'blockget',
 	'blocknametext',
 	'bothchannels',
@@ -384,6 +386,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'manasleep',
 	'mansatstill',
 	'maptopanel',
+	'mode640x480',
 	'modifychar',
 	'monmessage',
 	'monprint',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 50a0d3b..c64e2f9 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9653,23 +9653,6 @@ void DreamGenContext::middlePanel() {
 	showFrame();
 }
 
-void DreamGenContext::blank() {
-	STACK_CHECK;
-	_cmp(data.byte(kCommandtype), 199);
-	if (flags.z())
-		return /* (alreadyblnk) */;
-	data.byte(kCommandtype) = 199;
-	al = 0;
-	commandOnly();
-}
-
-void DreamGenContext::allPointer() {
-	STACK_CHECK;
-	readMouse();
-	showPointer();
-	dumpPointer();
-}
-
 void DreamGenContext::getUnderZoom() {
 	STACK_CHECK;
 	di = (8)+5;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f8968c2..ba8d645 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -643,7 +643,6 @@ public:
 	void cantDrop();
 	void copper();
 	void openHotelDoor();
-	void blank();
 	void drinker();
 	void nextColon();
 	void placeFreeObject();
@@ -799,7 +798,6 @@ public:
 	void initialMonCols();
 	void checkForShake();
 	void useButtonA();
-	void mode640x480();
 	void openEden();
 	void execCommand();
 	void obsThatDoThings();
@@ -812,7 +810,6 @@ public:
 	void makeMainScreen();
 	void useWinch();
 	void updateSymbolTop();
-	void allPointer();
 	void checkSoundInt();
 	void doSaveLoad();
 	void createName();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index fa0a3b0..b05b554 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1121,13 +1121,6 @@ void DreamGenContext::DOSReturn() {
 void DreamGenContext::set16ColPalette() {
 }
 
-void DreamGenContext::mode640x480() {
-	// Video mode 12h: 640x480 pixels, 16 colors, I believe
-	al = 0x12 + 128;
-	ah = 0;
-	initGraphics(640, 480, true);
-}
-
 void DreamGenContext::showGroup() {
 	engine->setPalette();
 }
@@ -3141,7 +3134,7 @@ void DreamGenContext::hangOne() {
 }
 
 void DreamGenContext::bibleQuote() {
-	mode640x480();
+	initGraphics(640, 480, true);
 
 	showPCX("DREAMWEB.I00");
 	fadeScreenUps();
@@ -3176,7 +3169,7 @@ void DreamGenContext::realCredits() {
 	loadRoomsSample();
 	data.byte(kVolume) = 0;
 
-	mode640x480();
+	initGraphics(640, 480, true);
 	hangOn(35);
 
 	showPCX("DREAMWEB.I01");
@@ -3578,5 +3571,18 @@ void DreamGenContext::selectSlot2() {
 		data.byte(kLoadingorsave) = 2;
 }
 
+void DreamGenContext::blank() {
+	if (data.byte(kCommandtype) != 199) {
+		data.byte(kCommandtype) = 199;
+		commandOnly(0);
+	}
+}
+
+void DreamGenContext::allPointer() {
+	readMouse();
+	showPointer();
+	dumpPointer();
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 94a30b0..046e7bd 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -511,5 +511,7 @@
 	void gettingShot();
 	void redrawMainScrn();
 	void selectSlot2();
+	void blank();
+	void allPointer();
 
 #endif