aboutsummaryrefslogtreecommitdiff
path: root/sword2
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-05-08 13:04:54 +0000
committerTorbjörn Andersson2005-05-08 13:04:54 +0000
commite39dea37e7cdb4ec5e5828549231a69639e9581e (patch)
tree8e73b956091e005f850dc303b4c11fa63fda4e74 /sword2
parent196127aa044f8ec499fc5a88cb27e6ce583d4f96 (diff)
downloadscummvm-rg350-e39dea37e7cdb4ec5e5828549231a69639e9581e.tar.gz
scummvm-rg350-e39dea37e7cdb4ec5e5828549231a69639e9581e.tar.bz2
scummvm-rg350-e39dea37e7cdb4ec5e5828549231a69639e9581e.zip
Quitting the game now implies that the game is done fading the screen.
svn-id: r17962
Diffstat (limited to 'sword2')
-rw-r--r--sword2/driver/palette.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp
index 3e42cef493..60f99253ad 100644
--- a/sword2/driver/palette.cpp
+++ b/sword2/driver/palette.cpp
@@ -208,7 +208,7 @@ uint8 Screen::getFadeStatus() {
}
void Screen::waitForFade() {
- while (getFadeStatus() != RDFADE_NONE && getFadeStatus() != RDFADE_BLACK) {
+ while (getFadeStatus() != RDFADE_NONE && getFadeStatus() != RDFADE_BLACK && !_vm->_quit) {
updateDisplay();
_vm->_system->delayMillis(20);
}