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

[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:
fb9b5d11ef DREAMWEB: Clearer API for enterCode


Commit: fb9b5d11efa3eac1aa43a8247fe5c4da4400dfb1
    https://github.com/scummvm/scummvm/commit/fb9b5d11efa3eac1aa43a8247fe5c4da4400dfb1
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-02T08:49:55-08:00

Commit Message:
DREAMWEB: Clearer API for enterCode

Changed paths:
    engines/dreamweb/keypad.cpp
    engines/dreamweb/stubs.h



diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index b05afa1..b70dee4 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -72,10 +72,10 @@ void DreamGenContext::showKeypad() {
 }
 
 void DreamGenContext::enterCode() {
-	enterCode(ax, cx);
+	enterCode(al, ah, cl, ch);
 }
 
-void DreamGenContext::enterCode(uint16 keypadAx, uint16 keypadCx) {
+void DreamGenContext::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
 	RectWithCallback keypadList[] = {
 		{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamGenContext::buttonOne },
 		{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamGenContext::buttonTwo },
@@ -93,8 +93,10 @@ void DreamGenContext::enterCode(uint16 keypadAx, uint16 keypadCx) {
 		{ 0xFFFF,0,0,0,0 }
 	};
 
-	data.word(kKeypadax) = keypadAx;
-	data.word(kKeypadcx) = keypadCx;
+	data.byte(kKeypadax+0) = digit0;
+	data.byte(kKeypadax+1) = digit1;
+	data.byte(kKeypadcx+0) = digit2;
+	data.byte(kKeypadcx+1) = digit3;
 	getRidOfReels();
 	loadKeypad();
 	createPanel();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a77d2c7..dda57a4 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -396,6 +396,6 @@
 	void buttonNought();
 	void buttonEnter();
 	void buttonPress(uint8 buttonId);
-	void enterCode(uint16 keypadAx, uint16 keypadCx);
+	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
 	void enterCode();