diff options
| author | Bertrand Augereau | 2011-11-20 21:26:18 +0100 |
|---|---|---|
| committer | Bertrand Augereau | 2011-11-20 21:26:18 +0100 |
| commit | 6cab17c832d01bb7963040b99fcb9c4e546dd582 (patch) | |
| tree | 749a8e60f1c13d8ec8a2e93c149a3c39c4ef77d8 /engines/dreamweb | |
| parent | 57fc322992046e4a8fc1dd0b1969843430ad7795 (diff) | |
| download | scummvm-rg350-6cab17c832d01bb7963040b99fcb9c4e546dd582.tar.gz scummvm-rg350-6cab17c832d01bb7963040b99fcb9c4e546dd582.tar.bz2 scummvm-rg350-6cab17c832d01bb7963040b99fcb9c4e546dd582.zip | |
DREAMWEB: Accessor for kQuitrequested
Diffstat (limited to 'engines/dreamweb')
| -rw-r--r-- | engines/dreamweb/monitor.cpp | 4 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.cpp | 20 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 3 |
3 files changed, 16 insertions, 11 deletions
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp index c09b7150b6..d0da5e3110 100644 --- a/engines/dreamweb/monitor.cpp +++ b/engines/dreamweb/monitor.cpp @@ -81,7 +81,7 @@ 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 + if (quitRequested()) //TODO : Check why it crashes when put before the execcommand break; } while (al == 0); getridoftemp(); @@ -117,7 +117,7 @@ void DreamGenContext::input() { vsync(); delcurs(); readkey(); - if (data.byte(kQuitrequested)) + if (quitRequested()) return; uint8 currentKey = data.byte(kCurrentkey); if (currentKey == 0) diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 8a191224af..d520307e0d 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -100,7 +100,7 @@ void DreamGenContext::dreamweb() { cls(); setmode(); decide(); - if (data.byte(kQuitrequested)) + if (quitRequested()) return; // exit game if (data.byte(kGetback) == 4) @@ -114,11 +114,11 @@ void DreamGenContext::dreamweb() { // "playgame" titles(); - if (data.byte(kQuitrequested)) + if (quitRequested()) return; // exit game credits(); - if (data.byte(kQuitrequested)) + if (quitRequested()) return; // exit game clearchanges(); @@ -146,12 +146,12 @@ void DreamGenContext::dreamweb() { // main loop while (true) { - if (data.byte(kQuitrequested)) + if (quitRequested()) return; // exit game screenupdate(); - if (data.byte(kQuitrequested)) + if (quitRequested()) return; // exit game if (data.byte(kWongame) != 0) { @@ -203,10 +203,14 @@ void DreamGenContext::dreamweb() { } } +bool DreamGenContext::quitRequested() { + return data.byte(kQuitrequested); +} + void DreamGenContext::screenupdate() { newplace(); mainscreen(); - if (data.byte(kQuitrequested)) + if (quitRequested()) return; animpointer(); showpointer(); @@ -1949,7 +1953,7 @@ void DreamGenContext::hangon(uint16 frameCount) { while (frameCount) { vsync(); --frameCount; - if (data.byte(kQuitrequested)) + if (quitRequested()) break; } } @@ -1979,7 +1983,7 @@ void DreamGenContext::hangonp(uint16 count) { showpointer(); vsync(); dumppointer(); - if (data.byte(kQuitrequested)) + if (quitRequested()) break; if (data.word(kMousebutton) != 0 && data.word(kMousebutton) != data.word(kOldbutton)) break; diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 27ed468325..29f888cd2d 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -19,7 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ - void screenupdate(); + void screenupdate(); + bool quitRequested(); void startup(); void startup1(); void switchryanon(); |