aboutsummaryrefslogtreecommitdiff
path: root/engines/teenagent
diff options
context:
space:
mode:
authorVladimir Menshakov2009-09-13 14:12:39 +0000
committerVladimir Menshakov2009-09-13 14:12:39 +0000
commita0808e58badb13dc045e5eb30178445f9cdff86b (patch)
treedf5516cfaa9f2e3ff16863c0ce042c5de584f378 /engines/teenagent
parent1d8b2b88778d1906a61028c58a74271f81287fbc (diff)
downloadscummvm-rg350-a0808e58badb13dc045e5eb30178445f9cdff86b.tar.gz
scummvm-rg350-a0808e58badb13dc045e5eb30178445f9cdff86b.tar.bz2
scummvm-rg350-a0808e58badb13dc045e5eb30178445f9cdff86b.zip
fixed double-taking of the captain's key
svn-id: r44060
Diffstat (limited to 'engines/teenagent')
-rw-r--r--engines/teenagent/callbacks.cpp20
1 files changed, 13 insertions, 7 deletions
diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp
index 6a748cc834..eedbe5872e 100644
--- a/engines/teenagent/callbacks.cpp
+++ b/engines/teenagent/callbacks.cpp
@@ -319,8 +319,9 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
playSound(71, 4);
playActorAnimation(823);
- //skipped one 826 animation for this scene!
- playSound(74, 4); //delay 10 in code
+ playSound(74, 1);
+ playSound(74, 3);
+ playSound(74, 6);
loadScene(5, scene->getPosition());
playActorAnimation(826);
loadScene(6, scene->getPosition());
@@ -344,11 +345,16 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
case 0x4662:
if (CHECK_FLAG(0xDBDD, 3)) {
- moveTo(280, 179, 2);
- playSound(49, 7);
- playActorAnimation(827);
- inventory->add(0x4d);
- SET_FLAG(0xDBDE, 1);
+ if (CHECK_FLAG(0xDBDE, 1)) {
+ displayMessage(0x5608);
+ } else {
+ moveTo(280, 179, 2);
+ playSound(49, 7);
+ playSound(5, 17);
+ playActorAnimation(827);
+ inventory->add(0x4d);
+ SET_FLAG(0xDBDE, 1);
+ }
} else
displayMessage(0x5905);
return true;