From 21d7db65787807250c55d3492f7ccaea66aec4a4 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Thu, 2 Aug 2012 08:44:14 +0100 Subject: [PATCH] TEENAGENT: Added missing callback for pushing House #2 doorbell. This is incomplete, but an improvement. It also shows where one of the missing messages is used. --- engines/teenagent/callbacks.cpp | 12 ++++++++---- engines/teenagent/resources.h | 3 --- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp index a491f114799..182546bcf3e 100644 --- a/engines/teenagent/callbacks.cpp +++ b/engines/teenagent/callbacks.cpp @@ -1596,6 +1596,14 @@ bool TeenAgentEngine::processCallback(uint16 addr) { displayMessage(dsAddr_dontNeedToOpenMsg); // "I don't need to open it" break; + case 0x5b44: + // FIXME - This is the doorbell use callback on House #2 + // i.e. Granny and Anne's House. Need to analyse cseg data properly. + // Current code inferred from behaviour. + // FIXME - Add animation call for Ego pushing doorbell. + displayMessage(dsAddr_ItsOpenMsg); + break; + case 0x5c72: displayMessage(dsAddr_notTiredMsg); // "Thanks, I'm not tired" break; @@ -4912,10 +4920,6 @@ bool TeenAgentEngine::processCallback(uint16 addr) { default: warning("unknown callback %04x called", addr); - // FIXME - unknown non-trivial callback 0x5b44 called! - // This is the doorbell use callback on House #2 i.e. - // Granny and Anne's House. Need to analyse cseg data. - // FIXME - unknown non-trivial callback 0x4056 called! // This is the bird use callback in the first act at // the mudpool. Need to analyse cseg data. diff --git a/engines/teenagent/resources.h b/engines/teenagent/resources.h index 6aaf7acc4e5..c34ccd8099d 100644 --- a/engines/teenagent/resources.h +++ b/engines/teenagent/resources.h @@ -756,11 +756,8 @@ const uint16 dsAddr_nothingToPlayMsg = 0x5d6e; // "I have nothing to play" const uint16 dsAddr_notMineMsg = 0x5d87; // "I can't take it. It's not mine." // Hey What's The Matter Message : 0x5da8 to 0x5dc1 const uint16 dsAddr_HeyWtmQMsg = 0x5da8; // "Hey! What's the matter?!" - -// FIXME - Where is this used?! // Its Open Message : 0x5dc2 to 0x5dcd const uint16 dsAddr_ItsOpenMsg = 0x5dc2; // "It's Open!" - // Out Of Order Message : 0x5dce to 0x5de1 const uint16 dsAddr_outOfOrderMsg = 0x5dce; // "It's out of order" // Captain Watching Message : 0x5de2 to 0x5e0a