aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/text_hof.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-05-08 21:23:14 +0000
committerJohannes Schickel2008-05-08 21:23:14 +0000
commitb53fe83695318a4e5545185a4fe7e7daa77f2bed (patch)
tree63375abab1ec4d915c0067400764247b8546155f /engines/kyra/text_hof.cpp
parente0689193efa852a4391c9afcf7581238b1c4a0d9 (diff)
downloadscummvm-rg350-b53fe83695318a4e5545185a4fe7e7daa77f2bed.tar.gz
scummvm-rg350-b53fe83695318a4e5545185a4fe7e7daa77f2bed.tar.bz2
scummvm-rg350-b53fe83695318a4e5545185a4fe7e7daa77f2bed.zip
Silenced some g++ 4.3 warnings.
svn-id: r31956
Diffstat (limited to 'engines/kyra/text_hof.cpp')
-rw-r--r--engines/kyra/text_hof.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text_hof.cpp
index 3a0dab730c..0d40827390 100644
--- a/engines/kyra/text_hof.cpp
+++ b/engines/kyra/text_hof.cpp
@@ -649,7 +649,7 @@ void KyraEngine_HoF::npcChatSequence(const char *str, int objectId, int vocHigh,
}
while (((textEnabled() && _chatEndTime > _system->getMillis()) || (speechEnabled() && snd_voiceIsPlaying())) && !(_quitFlag || skipFlag())) {
- if (!speechEnabled() && chatAnimEndTime > _system->getMillis() || speechEnabled() && snd_voiceIsPlaying()) {
+ if ((!speechEnabled() && chatAnimEndTime > _system->getMillis()) || (speechEnabled() && snd_voiceIsPlaying())) {
_tim->resetFinishedFlag();
while (!_tim->finished() && !skipFlag() && !_quitFlag) {
if (_currentTalkSections.TLKTim)