[Scummvm-cvs-logs] scummvm master -> a02457a122c0ac4db26550c49dbdb2e10e5a1d27

[tramboi]

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:
a02457a122 DREAMWEB: 'showOuterPad' ported to C++


Commit: a02457a122c0ac4db26550c49dbdb2e10e5a1d27
    https://github.com/scummvm/scummvm/commit/a02457a122c0ac4db26550c49dbdb2e10e5a1d27
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-03T06:25:35-08:00

Commit Message:
DREAMWEB: 'showOuterPad' ported to C++

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 99bfd21..2c81eb1 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -343,6 +343,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'sparky',
 	'singlekey',
 	'showkeypad',
+	'showouterpad',
 	'buttonone',
 	'buttontwo',
 	'buttonthree',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 2adc016..d9af7a3 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9152,22 +9152,6 @@ doqk:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::showOuterPad() {
-	STACK_CHECK;
-	di = (36+112)-3;
-	bx = (72)-4;
-	ds = data.word(kTempgraphics);
-	al = 1;
-	ah = 0;
-	showFrame();
-	di = (36+112)+74;
-	bx = (72)+76;
-	ds = data.word(kTempgraphics);
-	al = 37;
-	ah = 0;
-	showFrame();
-}
-
 void DreamGenContext::dumpKeypad() {
 	STACK_CHECK;
 	di = (36+112)-3;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e79e4c9..b4596e0 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -697,7 +697,7 @@ public:
 	void useElevator5();
 	void useElevator4();
 	void useElevator1();
-	void useElevator3();
+	void greyscaleSum();
 	void useElevator2();
 	void keyboardRead();
 	void getOpenedSize();
@@ -811,7 +811,7 @@ public:
 	void getRidOfTemp();
 	void dumpSymbol();
 	void intro2Text();
-	void showOuterPad();
+	void interviewer();
 	void getKeyAndLogo();
 	void selectOb();
 	void usePlinth();
@@ -851,7 +851,6 @@ public:
 	void showMonk();
 	void diaryKeyN();
 	void set16ColPalette();
-	void interviewer();
 	void purgeAnItem();
 	void madman();
 	void enableSoundInt();
@@ -997,7 +996,7 @@ public:
 	void openFile();
 	void showPuzText();
 	void incRyanPage();
-	void greyscaleSum();
+	void useElevator3();
 	void findExObject();
 	void clearChanges();
 	void useChurchHole();
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index b773d65..5265c56 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -223,5 +223,10 @@ void DreamGenContext::buttonPress(uint8 buttonId) {
 	}
 }
 
+void DreamGenContext::showOuterPad() {
+	showFrame(tempGraphics(), kKeypadx-3, kKeypady-4, 1, 0);
+	showFrame(tempGraphics(), kKeypadx+74, kKeypady+76, 37, 0);
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 62da07d..d12f398 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -384,6 +384,7 @@
 	void sparky(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void showKeypad();
+	void showOuterPad();
 	void buttonOne();
 	void buttonTwo();
 	void buttonThree();