aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_v2.cpp
diff options
context:
space:
mode:
authorFlorian Kagerer2008-03-16 17:16:17 +0000
committerFlorian Kagerer2008-03-16 17:16:17 +0000
commit04a2ac14854c302c88b9f17cb5c9dbacf1fa6a89 (patch)
treea5746d8a04369eecee96688ffa32a66efca15282 /engines/kyra/kyra_v2.cpp
parent79cc924d0e82fc6da46d0d776ed5949c105af453 (diff)
downloadscummvm-rg350-04a2ac14854c302c88b9f17cb5c9dbacf1fa6a89.tar.gz
scummvm-rg350-04a2ac14854c302c88b9f17cb5c9dbacf1fa6a89.tar.bz2
scummvm-rg350-04a2ac14854c302c88b9f17cb5c9dbacf1fa6a89.zip
- implement zanthIdleChat()
- bug fix for zanthRandomChat() svn-id: r31147
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
-rw-r--r--engines/kyra/kyra_v2.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index 84c2cd1029..69473257bb 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -1593,14 +1593,14 @@ void KyraEngine_v2::showIdleAnim() {
0x04, 0x06, 0x07, 0x08, 0x04, 0x09, 0x0A, 0x0B, 0xFF, 0x00
};
- if (queryGameFlag(0x159))
+ if (queryGameFlag(0x159 && _flags.isTalkie))
return;
static bool scriptAnimation = false;
- //if (!scriptAnimation) {
- // scriptAnimation = true;
- // sub_2715D();
- //} else {
+ if (!scriptAnimation && _flags.isTalkie) {
+ scriptAnimation = true;
+ zanthIdleChat();
+ } else {
scriptAnimation = false;
if (_loadedZTable > 8)
return;
@@ -1619,7 +1619,7 @@ void KyraEngine_v2::showIdleAnim() {
runIdleScript(script);
_lastIdleScript = script;
- //}
+ }
}
void KyraEngine_v2::runIdleScript(int script) {