aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2009-11-08 18:55:18 +0000
committerJohannes Schickel2009-11-08 18:55:18 +0000
commitf8ab3f866e4592a4dd6c984b9d58f21844ea132f (patch)
treedf92307feeb325320cc2b2373633ecf7cb47bb35 /engines
parent99bd90cfac6f7c5f54bc9544368773fdef25d2b5 (diff)
downloadscummvm-rg350-f8ab3f866e4592a4dd6c984b9d58f21844ea132f.tar.gz
scummvm-rg350-f8ab3f866e4592a4dd6c984b9d58f21844ea132f.tar.bz2
scummvm-rg350-f8ab3f866e4592a4dd6c984b9d58f21844ea132f.zip
Silence gcc warning by putting parentheses around an && expression nested in an || expression.
svn-id: r45752
Diffstat (limited to 'engines')
-rw-r--r--engines/draci/animation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/draci/animation.cpp b/engines/draci/animation.cpp
index 3121cc2a40..ba98a0ab25 100644
--- a/engines/draci/animation.cpp
+++ b/engines/draci/animation.cpp
@@ -97,7 +97,7 @@ void Animation::nextFrame(bool force) {
Surface *surface = _vm->_screen->getSurface();
if (force || (_tick + frame->getDelay() <= _vm->_system->getMillis()) ||
- _canBeQuick && _vm->_game->getEnableQuickHero() && _vm->_game->getWantQuickHero()) {
+ (_canBeQuick && _vm->_game->getEnableQuickHero() && _vm->_game->getWantQuickHero())) {
// If we are at the last frame and not looping, stop the animation
// The animation is also restarted to frame zero
if ((_currentFrame == getFrameCount() - 1) && !_looping) {