aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2011-07-01 20:09:36 +1000
committerPaul Gilbert2011-07-02 14:23:38 +1000
commit3469d1fb04d84840bb720c472b79f738b72a08e8 (patch)
tree0eb2be1e374ca146ad27f1750d56c08ed2a35864 /engines
parent8e531d0da391b895a573c36c4b1bd8074571df83 (diff)
downloadscummvm-rg350-3469d1fb04d84840bb720c472b79f738b72a08e8.tar.gz
scummvm-rg350-3469d1fb04d84840bb720c472b79f738b72a08e8.tar.bz2
scummvm-rg350-3469d1fb04d84840bb720c472b79f738b72a08e8.zip
CGE: Bugfix to correctly reset wait timeouts when done
Diffstat (limited to 'engines')
-rw-r--r--engines/cge/snail.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp
index baaac250dd..54b786722f 100644
--- a/engines/cge/snail.cpp
+++ b/engines/cge/snail.cpp
@@ -913,9 +913,15 @@ void SNAIL::RunCom(void) {
COM *snc = &SNList[Tail];
if (! Turbo) { // only for the slower one
- if (_timerExpiry && (_timerExpiry > g_system->getMillis()))
- break;
- else {
+ if (_timerExpiry) {
+ // Delay in progress
+ if (_timerExpiry > g_system->getMillis())
+ // Delay not yet ended
+ break;
+
+ // Delay is finished
+ _timerExpiry = 0;
+ } else {
if (TextDelay) {
KillText();
TextDelay = false;