From 734e6c49b1a2aba7c88acd9ad1b177810b31cbce Mon Sep 17 00:00:00 2001
From: Bertrand Augereau
Date: Fri, 2 Dec 2011 16:05:44 +0100
Subject: DREAMWEB: Keypad button callbacks blacklisted

---
 devtools/tasmrecover/tasm-recover | 11 +++++++
 engines/dreamweb/dreamgen.cpp     | 66 ---------------------------------------
 engines/dreamweb/dreamgen.h       | 17 ++--------
 engines/dreamweb/keypad.cpp       | 55 ++++++++++++++++++++++++++++++++
 engines/dreamweb/stubs.h          | 11 +++++++
 5 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index cb643833ec..61d740ae2f 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -343,6 +343,17 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'sparky',
 	'singlekey',
 	'showkeypad',
+	'buttonone',
+	'buttontwo',
+	'buttonthree',
+	'buttonfour',
+	'buttonfive',
+	'buttonsix',
+	'buttonseven',
+	'buttoneight',
+	'buttonnine',
+	'buttonnought',
+	'buttonenter',
 	'credits',
 	'entercode',
 	], skip_output = [
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 28e45bb7bc..44a48e723b 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9188,72 +9188,6 @@ not10:
 	_inc(data.word(kPresspointer));
 }
 
-void DreamGenContext::buttonOne() {
-	STACK_CHECK;
-	cl = 1;
-	buttonPress();
-}
-
-void DreamGenContext::buttonTwo() {
-	STACK_CHECK;
-	cl = 2;
-	buttonPress();
-}
-
-void DreamGenContext::buttonThree() {
-	STACK_CHECK;
-	cl = 3;
-	buttonPress();
-}
-
-void DreamGenContext::buttonFour() {
-	STACK_CHECK;
-	cl = 4;
-	buttonPress();
-}
-
-void DreamGenContext::buttonFive() {
-	STACK_CHECK;
-	cl = 5;
-	buttonPress();
-}
-
-void DreamGenContext::buttonSix() {
-	STACK_CHECK;
-	cl = 6;
-	buttonPress();
-}
-
-void DreamGenContext::buttonSeven() {
-	STACK_CHECK;
-	cl = 7;
-	buttonPress();
-}
-
-void DreamGenContext::buttonEight() {
-	STACK_CHECK;
-	cl = 8;
-	buttonPress();
-}
-
-void DreamGenContext::buttonNine() {
-	STACK_CHECK;
-	cl = 9;
-	buttonPress();
-}
-
-void DreamGenContext::buttonNought() {
-	STACK_CHECK;
-	cl = 10;
-	buttonPress();
-}
-
-void DreamGenContext::buttonEnter() {
-	STACK_CHECK;
-	cl = 11;
-	buttonPress();
-}
-
 void DreamGenContext::buttonPress() {
 	STACK_CHECK;
 	ch = cl;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 5a49942e9a..cbf8bf64f2 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -663,7 +663,6 @@ public:
 	void readKey();
 	void louis();
 	void entryTexts();
-	void buttonEnter();
 	void checkInput();
 	void setMode();
 	void getBackFromOps();
@@ -674,7 +673,6 @@ public:
 	void deallocateMem();
 	void mainScreen();
 	void watchReel();
-	void showSlots();
 	void openFileFromC();
 	void getTime();
 	void candles1();
@@ -687,7 +685,6 @@ public:
 	void useCashCard();
 	void useWall();
 	void openTomb();
-	void buttonFour();
 	void doSomeTalk();
 	void getAnyAdDir();
 	void showSaveOps();
@@ -702,7 +699,6 @@ public:
 	void useElevator1();
 	void useElevator3();
 	void useElevator2();
-	void buttonOne();
 	void keyboardRead();
 	void getOpenedSize();
 	void doShake();
@@ -753,7 +749,6 @@ public:
 	void disableSoundInt();
 	void priestText();
 	void openPoolBoss();
-	void buttonTwo();
 	void fadeScreenDownHalf();
 	void usePlate();
 	void lookInInterface();
@@ -815,7 +810,6 @@ public:
 	void loadGame();
 	void getRidOfTemp();
 	void dumpSymbol();
-	void buttonSix();
 	void intro2Text();
 	void showOuterPad();
 	void getKeyAndLogo();
@@ -897,7 +891,6 @@ public:
 	void openInv();
 	void lookAtPlace();
 	void useAxe();
-	void buttonNought();
 	void useElvDoor();
 	void putBackObStuff();
 	void useLadder();
@@ -905,14 +898,13 @@ public:
 	void handClap();
 	void smokeBloke();
 	void afterIntroRoom();
-	void buttonNine();
 	void findAllOpen();
 	void readFromFile();
 	void initialInv();
 	void quitSymbol();
 	void setTopRight();
 	void findSetObject();
-	void hangOne();
+	void getPersonText();
 	void carParkDrip();
 	void useDiary();
 	void deleteExObject();
@@ -922,7 +914,6 @@ public:
 	void removeFreeObject();
 	void trapDoor();
 	void openLouis();
-	void buttonThree();
 	void lookAtCard();
 	void helicopter();
 	void setSoundOff();
@@ -990,7 +981,7 @@ public:
 	void searchForString();
 	void selectOpenOb();
 	void security();
-	void buttonFive();
+	void showSlots();
 	void soundOnReels();
 	void useGun();
 	void autoAppear();
@@ -1009,7 +1000,6 @@ public:
 	void showPuzText();
 	void incRyanPage();
 	void greyscaleSum();
-	void buttonEight();
 	void findExObject();
 	void clearChanges();
 	void useChurchHole();
@@ -1037,7 +1027,6 @@ public:
 	void monkAndRyan();
 	void swapWithInv();
 	void useControl();
-	void buttonSeven();
 	void redrawMainScrn();
 	void showGroup();
 	void buttonPress();
@@ -1056,7 +1045,7 @@ public:
 	void doSaveLoad();
 	void createName();
 	void readCityPic();
-	void getPersonText();
+	void hangOne();
 	void inToInv();
 	void parser();
 	void setMouse();
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index f55d8f911d..743d539f08 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -152,5 +152,60 @@ void DreamGenContext::enterCode(uint16 keypadAx, uint16 keypadCx) {
 	workToScreenM();
 }
 
+void DreamGenContext::buttonOne() {
+	cl = 1;
+	buttonPress();
+}
+
+void DreamGenContext::buttonTwo() {
+	cl = 2;
+	buttonPress();
+}
+
+void DreamGenContext::buttonThree() {
+	cl = 3;
+	buttonPress();
+}
+
+void DreamGenContext::buttonFour() {
+	cl = 4;
+	buttonPress();
+}
+
+void DreamGenContext::buttonFive() {
+	cl = 5;
+	buttonPress();
+}
+
+void DreamGenContext::buttonSix() {
+	cl = 6;
+	buttonPress();
+}
+
+void DreamGenContext::buttonSeven() {
+	cl = 7;
+	buttonPress();
+}
+
+void DreamGenContext::buttonEight() {
+	cl = 8;
+	buttonPress();
+}
+
+void DreamGenContext::buttonNine() {
+	cl = 9;
+	buttonPress();
+}
+
+void DreamGenContext::buttonNought() {
+	cl = 10;
+	buttonPress();
+}
+
+void DreamGenContext::buttonEnter() {
+	cl = 11;
+	buttonPress();
+}
+
 } /*namespace dreamgen */
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5ac9a97c28..4b9e54c023 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -384,6 +384,17 @@
 	void sparky(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void showKeypad();
+	void buttonOne();
+	void buttonTwo();
+	void buttonThree();
+	void buttonFour();
+	void buttonFive();
+	void buttonSix();
+	void buttonSeven();
+	void buttonEight();
+	void buttonNine();
+	void buttonNought();
+	void buttonEnter();
 	void enterCode(uint16 keypadAx, uint16 keypadCx);
 	void enterCode();
 
-- 
cgit v1.2.3