libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-19 08:06:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TEENAGENT: Further symbol migration for processCallback() usage.

Browse Source
This commit is contained in:
D G Turner 2012-07-17 00:04:27 +01:00
parent d7dcbb2c2d
commit 5563abae6d
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/teenagent/callbacks.cpp
View File

@ -776,7 +776,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
SET_FLAG(0, 0);
break;
case 0x5189: // guard is drinking, boo!
case csAddr_guardDrinking:
SET_FLAG(0, 0);
setTimerCallback(0, 0);
scene->getAnimation(0)->free();
@ -2837,7 +2837,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
SET_FLAG(0, 0);
break;
case 0x8d57:
case csAddr_putRockInHole:
if (CHECK_FLAG(0, 0)) {
playSound(5, 2);
playSound(15, 12);
@ -3923,7 +3923,7 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
}
break;
case 0x99e0: // success getting an anchor
case csAddr_gotAnchor:
SET_FLAG(0, 0);
setTimerCallback(0, 0);
scene->getActorAnimation()->free();

6
engines/teenagent/resources.h
View File

@ -34,6 +34,12 @@ namespace TeenAgent {
// Code Segment Addresses (Read Only)
// Intro function : 0x024c
const uint16 csAddr_intro = 0x024c;
// Guard Drinking function : 0x5189
const uint16 csAddr_guardDrinking = 0x5189;
// Putting Rock in Hole function : 0x8d57
const uint16 csAddr_putRockInHole = 0x8d57;
// Successfully Got Anchor function : 0x99e0
const uint16 csAddr_gotAnchor = 0x99e0;
// Display Message function : 0xa055
const uint16 csAddr_displayMsg = 0xa055;
// Reject Message function : 0xa4d6

2
engines/teenagent/scene.h
View File

@ -172,7 +172,7 @@ private:
void playAnimation(byte idx, uint id, bool loop, bool paused, bool ignore);
void playActorAnimation(uint id, bool loop, bool ignore);
byte palette[768];
byte palette[3 * 256];
void paletteEffect(byte step);
byte findFade() const;

8
engines/teenagent/teenagent.cpp
View File

@ -93,7 +93,7 @@ bool TeenAgentEngine::trySelectedObject() {
if ((res->dseg.get_byte(0) == 1 && inv->id == 49 && dst_object->id == 5) ||
(res->dseg.get_byte(0) == 2 && inv->id == 29 && dst_object->id == 5)) {
//putting rock into hole or superglue on rock
processCallback(0x8d57);
processCallback(csAddr_putRockInHole);
return true;
}
@ -563,7 +563,7 @@ Common::Error TeenAgentEngine::run() {
return Common::kNoError;
scene->intro = true;
scene_busy = true;
processCallback(0x024c);
processCallback(csAddr_intro);
}
CursorMan.showMouse(true);
@ -615,11 +615,11 @@ Common::Error TeenAgentEngine::run() {
break;
if (res->dseg.get_byte(0) == 3 && current_object->id == 1) {
processCallback(0x5189); // guard is drinking, boo!
processCallback(csAddr_guardDrinking);
break;
}
if (res->dseg.get_byte(0) == 4 && current_object->id == 5) {
processCallback(0x99e0); // success getting an anchor
processCallback(csAddr_gotAnchor);
break;
}
use(current_object);