aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2/screen.cpp
diff options
context:
space:
mode:
authorChristopher Page2008-07-13 22:00:39 +0000
committerChristopher Page2008-07-13 22:00:39 +0000
commit796e606971cf20aabd1fd8fdbc31d2210b7a5a3b (patch)
tree9d501a9b2e37f2925af6aee88134263455adc2a1 /engines/sword2/screen.cpp
parente7d7f8df95fc45c9fedb5238e6634080cb8f49cf (diff)
downloadscummvm-rg350-796e606971cf20aabd1fd8fdbc31d2210b7a5a3b.tar.gz
scummvm-rg350-796e606971cf20aabd1fd8fdbc31d2210b7a5a3b.tar.bz2
scummvm-rg350-796e606971cf20aabd1fd8fdbc31d2210b7a5a3b.zip
SWORD2 works with the new GMM implementation
svn-id: r33044
Diffstat (limited to 'engines/sword2/screen.cpp')
-rw-r--r--engines/sword2/screen.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp
index fdabb3ee6f..b2fcc45c9c 100644
--- a/engines/sword2/screen.cpp
+++ b/engines/sword2/screen.cpp
@@ -389,7 +389,7 @@ void Screen::displayMsg(byte *text, int time) {
uint32 targetTime = _vm->getMillis() + (time * 1000);
_vm->sleepUntil(targetTime);
} else {
- while (!_vm->_quit) {
+ while (!_vm->quit()) {
MouseEvent *me = _vm->mouseEvent();
if (me && (me->buttons & (RD_LEFTBUTTONDOWN | RD_RIGHTBUTTONDOWN)))
break;
@@ -1035,7 +1035,7 @@ void Screen::rollCredits() {
uint32 musicLength = MAX((int32)(1000 * (_vm->_sound->musicTimeRemaining() - 3)), 25 * (int32)scrollSteps);
- while (scrollPos < scrollSteps && !_vm->_quit) {
+ while (scrollPos < scrollSteps && !_vm->quit()) {
clearScene();
for (i = startLine; i < lineCount; i++) {
@@ -1123,13 +1123,13 @@ void Screen::rollCredits() {
// The music should either have stopped or be about to stop, so
// wait for it to really happen.
- while (_vm->_sound->musicTimeRemaining() && !_vm->_quit) {
+ while (_vm->_sound->musicTimeRemaining() && !_vm->quit()) {
updateDisplay(false);
_vm->_system->delayMillis(100);
}
}
- if (_vm->_quit)
+ if (_vm->quit())
return;
waitForFade();