[Scummvm-cvs-logs] scummvm master -> eeb3743a586b9f5b6bfd30c9b4cfe2879f6ada7b
tramboi
bertrand_augereau at yahoo.fr
Fri Nov 18 06:59:21 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:
eeb3743a58 DREAMWEB: Allow quitting in monitor sequences
Commit: eeb3743a586b9f5b6bfd30c9b4cfe2879f6ada7b
https://github.com/scummvm/scummvm/commit/eeb3743a586b9f5b6bfd30c9b4cfe2879f6ada7b
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-17T23:58:08-08:00
Commit Message:
DREAMWEB: Allow quitting in monitor sequences
Changed paths:
engines/dreamweb/monitor.cpp
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index d53b0b2..cbd1bc8 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -85,6 +85,8 @@ void DreamGenContext::usemon() {
data.word(kMonadx) = di;
data.word(kMonady) = bx;
execcommand();
+ if (data.byte(kQuitrequested)) //TODO : Check why it crashes when put before the execcommand
+ break;
} while (al == 0);
getridoftemp();
getridoftempcharset();
@@ -119,6 +121,8 @@ void DreamGenContext::input() {
vsync();
delcurs();
readkey();
+ if (data.byte(kQuitrequested))
+ return;
uint8 currentKey = data.byte(kCurrentkey);
if (currentKey == 0)
continue;
More information about the Scummvm-git-logs
mailing list