aboutsummaryrefslogtreecommitdiff
path: root/engines/teenagent
diff options
context:
space:
mode:
authorD G Turner2012-07-28 09:44:16 +0100
committerD G Turner2012-07-28 09:44:16 +0100
commit955f5b5180e3852b0440638bfff00b1a65dd734e (patch)
tree90f28946347aaaab5022f7a9c02fb7d28b7577db /engines/teenagent
parent7032dd5a1dd804b1691c98a0982f3eb0691537cb (diff)
downloadscummvm-rg350-955f5b5180e3852b0440638bfff00b1a65dd734e.tar.gz
scummvm-rg350-955f5b5180e3852b0440638bfff00b1a65dd734e.tar.bz2
scummvm-rg350-955f5b5180e3852b0440638bfff00b1a65dd734e.zip
TEENAGENT: Add symbols for functions called by TimerCallback().
Diffstat (limited to 'engines/teenagent')
-rw-r--r--engines/teenagent/callbacks.cpp14
-rw-r--r--engines/teenagent/resources.h6
2 files changed, 13 insertions, 7 deletions
diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp
index d87b23b837..3d2c95f80d 100644
--- a/engines/teenagent/callbacks.cpp
+++ b/engines/teenagent/callbacks.cpp
@@ -224,7 +224,7 @@ void TeenAgentEngine::fnPutRockInHole() {
playSound(15, 12);
playActorAnimation(638);
inventory->remove(48);
- setTimerCallback(0x8d79, 100);
+ setTimerCallback(csAddr_mouseOutOfHoleTimeout, 100);
SET_FLAG(0x0000, 1);
} else if (CHECK_FLAG(0, 1)) {
playSound(5, 2);
@@ -232,7 +232,7 @@ void TeenAgentEngine::fnPutRockInHole() {
playActorAnimation(648);
setOns(1, 46);
inventory->remove(49);
- setTimerCallback(0x8d79, 100);
+ setTimerCallback(csAddr_mouseOutOfHoleTimeout, 100);
SET_FLAG(0x0000, 2);
} else if (CHECK_FLAG(0, 2)) {
playActorAnimation(649);
@@ -1145,12 +1145,12 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
if (!CHECK_FLAG(0xdb9c, 1)) {
// guard is drinking
SET_FLAG(0x0000, 3);
- setTimerCallback(0x516d, 40);
+ setTimerCallback(csAddr_guardScareTimeout, 40);
playAnimation(544, 0, true, true); // ignore busy flag for this animation
}
break;
- case 0x516d: // too late to scare guard, resetting
+ case csAddr_guardScareTimeout: // too late to scare guard, resetting
SET_FLAG(0x0000, 0);
break;
@@ -3116,7 +3116,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
scene->getObject(3)->save();
break;
- case 0x8d79: // mouse falls back from the hole (cave)
+ case csAddr_mouseOutOfHoleTimeout: // mouse falls back from the hole (cave)
if (CHECK_FLAG(0, 1)) {
inventory->add(48);
playSound(24, 26);
@@ -4138,13 +4138,13 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
playSound(64, 21);
playSound(64, 42);
playSound(64, 63);
- setTimerCallback(0x9a1d, 30);
+ setTimerCallback(csAddr_noAnchorTimeout, 30);
playActorAnimation(617, false, true);
}
}
break;
- case 0x9a1d: // no anchor, timeout
+ case csAddr_noAnchorTimeout: // no anchor, timeout
SET_FLAG(0x0000, 0);
fnGetOutOfLake();
INC_FLAG(0xdba6);
diff --git a/engines/teenagent/resources.h b/engines/teenagent/resources.h
index 46b709bc5e..1cf128619a 100644
--- a/engines/teenagent/resources.h
+++ b/engines/teenagent/resources.h
@@ -38,6 +38,8 @@ const uint16 csAddr_intro = 0x024c;
const uint16 csAddr_poleClimbFail = 0x4173;
// Move Ego (Mark) To Suspicious Position function : 0x505c
const uint16 csAddr_egoSuspiciousPosition = 0x505c;
+// Guard Scare Timeout function : 0x516d
+const uint16 csAddr_guardScareTimeout = 0x516d;
// Guard Drinking function : 0x5189
const uint16 csAddr_guardDrinking = 0x5189;
// Move Ego (Mark) To Default Position function : 0x557e
@@ -72,12 +74,16 @@ const uint16 csAddr_givingFlowerToAnne = 0x8942;
const uint16 csAddr_giveAnotherFlowerToAnne = 0x89aa;
// Putting Rock in Hole function : 0x8d57
const uint16 csAddr_putRockInHole = 0x8d57;
+// Mouse Out Of Hole Timeout function : 0x8d79
+const uint16 csAddr_mouseOutOfHoleTimeout = 0x8d79;
// Robot Safe (Mike) Already Unlocked Check function : 0x9166
const uint16 csAddr_robotSafeAlreadyUnlockedCheck = 0x9166;
// Robot Safe (Mike) Unlock Check function : 0x9175
const uint16 csAddr_robotSafeUnlockCheck = 0x9175;
// Successfully Got Anchor function : 0x99e0
const uint16 csAddr_gotAnchor = 0x99e0;
+// No Anchor Timeout function : 0x9a1d
+const uint16 csAddr_noAnchorTimeout = 0x9a1d;
// Get Out of Lake function : 0x9a7a
const uint16 csAddr_getOutOfLake = 0x9a7a;
// Mansion Intrusion Attempt function : 0x9d45