[Scummvm-cvs-logs] scummvm master -> 6c5f4245404fa7ed3e1732203d7154663d8b5808

[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:
6c5f424540 DREAMWEB: Port 'quitSymbol' to C++


Commit: 6c5f4245404fa7ed3e1732203d7154663d8b5808
    https://github.com/scummvm/scummvm/commit/6c5f4245404fa7ed3e1732203d7154663d8b5808
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-09T08:40:34-08:00

Commit Message:
DREAMWEB: Port 'quitSymbol' 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 8e95f1c..1c4690c 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -552,6 +552,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'putunderzoom',
 	'quickquit',
 	'quickquit2',
+	'quitsymbol',
 	'random',
 	'randomaccess',
 	'randomnum1',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 28dfa9d..0ffc434 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -5273,33 +5273,6 @@ doqk:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::quitSymbol() {
-	STACK_CHECK;
-	_cmp(data.byte(kSymboltopx), 24);
-	if (!flags.z())
-		{ blank(); return; };
-	_cmp(data.byte(kSymbolbotx), 24);
-	if (!flags.z())
-		{ blank(); return; };
-	_cmp(data.byte(kCommandtype), 222);
-	if (flags.z())
-		goto alreadyqs;
-	data.byte(kCommandtype) = 222;
-	al = 18;
-	commandOnly();
-alreadyqs:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (notqs) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto doqs;
-	return;
-doqs:
-	data.byte(kGetback) = 1;
-}
-
 void DreamGenContext::updateSymbolTop() {
 	STACK_CHECK;
 	_cmp(data.byte(kSymboltopdir), 0);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e73f224..02195cb 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -541,7 +541,7 @@ public:
 	void checkObjectSize();
 	void findText1();
 	void isRyanHolding();
-	void quitSymbol();
+	void showSlots();
 	void useCashCard();
 	void moneyPoke();
 	void doSomeTalk();
@@ -576,9 +576,9 @@ public:
 	void useKey();
 	void dirFile();
 	void pickupConts();
+	void nextColon();
 	void allPalette();
 	void cantDrop();
-	void nextColon();
 	void findInvPos();
 	void rollEndCredits();
 	void getKeyAndLogo();
@@ -610,7 +610,7 @@ public:
 	void lookAtPlace();
 	void useAxe();
 	void findAllOpen();
-	void showSlots();
+	void fillOpen();
 	void findSetObject();
 	void deleteExObject();
 	void removeFreeObject();
@@ -626,7 +626,6 @@ public:
 	void showDiaryKeys();
 	void rollEndCredits2();
 	void useOpened();
-	void fillOpen();
 	void signOn();
 	void locationPic();
 	void triggerMessage();
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index fb6d2ff..8707354 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -244,4 +244,24 @@ void DreamGenContext::dumpSymBox() {
 	}
 }
 
+void DreamGenContext::quitSymbol() {
+	if (data.byte(kSymboltopx) != 24 || data.byte(kSymbolbotx) != 24) {
+		blank();
+		return;
+	};
+
+	if (data.byte(kCommandtype) != 222) {
+		data.byte(kCommandtype) = 222;
+		commandOnly(18);
+	}
+
+	if (data.word(kMousebutton) = data.word(kOldbutton))
+		return;	// notqs
+
+	if (!(data.word(kMousebutton) & 1))
+		return;
+
+	data.byte(kGetback) = 1;
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 9430325..3930e06 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -563,5 +563,6 @@
 	void showGun();
 	void endGame();
 	void monitorLogo();
+	void quitSymbol();
 
 #endif