[Scummvm-cvs-logs] scummvm master -> 202cf3ae0b78a965d06a93ff1cb09311170f4eeb

tramboi bertrand_augereau at yahoo.fr
Sun Dec 4 17:59:07 CET 2011


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:
202cf3ae0b DREAMWEB: 'DOSReturn' cleanup


Commit: 202cf3ae0b78a965d06a93ff1cb09311170f4eeb
    https://github.com/scummvm/scummvm/commit/202cf3ae0b78a965d06a93ff1cb09311170f4eeb
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T10:55:22-08:00

Commit Message:
DREAMWEB: 'DOSReturn' cleanup

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4c3115f..0e10127 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1143,20 +1143,15 @@ void DreamGenContext::loadSeg() {
 }
 
 void DreamGenContext::DOSReturn() {
-	_cmp(data.byte(kCommandtype), 250);
-	if (!flags.z()) {
+	if (data.byte(kCommandtype) != 250) {
 		data.byte(kCommandtype) = 250;
-		al = 46;
-		commandOnly();
+		commandOnly(46);
 	}
 
-	ax = data.word(kMousebutton);
-	_and(ax, 1);
-	if (flags.z())
-		return;
-
-	data.word(kMousebutton) = 0;
-	engine->quit();
+	if (data.word(kMousebutton) & 1) {
+		data.word(kMousebutton) = 0;
+		engine->quit();
+	}
 }
 
 void DreamGenContext::set16ColPalette() {






More information about the Scummvm-git-logs mailing list