aboutsummaryrefslogtreecommitdiff
path: root/engines/cge2/snail.cpp
diff options
context:
space:
mode:
authoruruk2014-05-24 00:11:43 +0200
committeruruk2014-05-24 00:11:43 +0200
commiteb800807849989fc44f85ec2113520e868c4f7a8 (patch)
tree7763c3f0cb938580c58417b27119774e21b93898 /engines/cge2/snail.cpp
parent947f4b860759940dfc6420ca84870b210b1253c5 (diff)
downloadscummvm-rg350-eb800807849989fc44f85ec2113520e868c4f7a8.tar.gz
scummvm-rg350-eb800807849989fc44f85ec2113520e868c4f7a8.tar.bz2
scummvm-rg350-eb800807849989fc44f85ec2113520e868c4f7a8.zip
CGE2: Some refactoring and fixing regarding runCommand().
Diffstat (limited to 'engines/cge2/snail.cpp')
-rw-r--r--engines/cge2/snail.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/engines/cge2/snail.cpp b/engines/cge2/snail.cpp
index 052188c6e0..ad643ac724 100644
--- a/engines/cge2/snail.cpp
+++ b/engines/cge2/snail.cpp
@@ -90,15 +90,14 @@ void CommandHandler::runCommand() {
// Delay is finished
_timerExpiry = 0;
- } else {
- if (_textDelay) {
- if (_vm->_talk) {
- _vm->snKill((Sprite *)_vm->_talk);
- _vm->_talk = nullptr;
- }
- _textDelay = false;
+ } else if (_textDelay) {
+ if (_vm->_talk) {
+ _vm->snKill((Sprite *)_vm->_talk);
+ _vm->_talk = nullptr;
}
+ _textDelay = false;
}
+
if (_vm->_talk && tailCmd._commandType != kCmdPause)
break;
}