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

[whoozle]

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:
a63e5939ed DREAMWEB: Fixed quit from keypad screen


Commit: a63e5939ed9f88e0609426e0e83c9fc7a90d38ab
    https://github.com/scummvm/scummvm/commit/a63e5939ed9f88e0609426e0e83c9fc7a90d38ab
Author: Vladimir Menshakov (whoozle at yandex.ru)
Date: 2011-06-25T02:40:56-07:00

Commit Message:
DREAMWEB: Fixed quit from keypad screen

Changed paths:
    devtools/tasmrecover/dreamweb/keypad.asm
    engines/dreamweb/dreamgen.cpp



diff --git a/devtools/tasmrecover/dreamweb/keypad.asm b/devtools/tasmrecover/dreamweb/keypad.asm
index 3638f35..8d918e6 100644
--- a/devtools/tasmrecover/dreamweb/keypad.asm
+++ b/devtools/tasmrecover/dreamweb/keypad.asm
@@ -18,7 +18,11 @@ Entercode	proc	near
 	mov	presspointer,0
 	mov	getback,0
 
-keypadloop:	call	delpointer
+keypadloop:
+	cmp quitrequested, 0
+	jnz numberright
+
+	call	delpointer
 	call	readmouse
 	call	showkeypad
 	call	showpointer
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 954b08e..253b49a 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -14360,10 +14360,14 @@ void DreamGenContext::entercode() {
 	data.word(kPresspointer) = 0;
 	data.byte(kGetback) = 0;
 keypadloop:
+	_cmp(data.byte(kQuitrequested),  0);
+	if (!flags.z())
+		goto numberright;
 	delpointer();
 	readmouse();
 	showkeypad();
 	showpointer();
+	vsync();
 	_cmp(data.byte(kPresscount), 0);
 	if (flags.z())
 		goto nopresses;
@@ -14630,7 +14634,6 @@ void DreamGenContext::showkeypad() {
 	di = (36+112)+31;
 	bx = (72)+59;
 	singlekey();
-	vsync();
 	_cmp(data.byte(kLightcount), 0);
 	if (flags.z())
 		return /* (notenter) */;