diff options
| author | Paul Gilbert | 2007-02-26 22:56:02 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2007-02-26 22:56:02 +0000 |
| commit | 41574458fc7bbb02566a1e7041ca096d49fc8145 (patch) | |
| tree | 451d8f26829033feda4d1c89a326a28fa16bc086 /engines/lure | |
| parent | 437bc950b67e36427d39799fd43c12ae5113286b (diff) | |
| download | scummvm-rg350-41574458fc7bbb02566a1e7041ca096d49fc8145.tar.gz scummvm-rg350-41574458fc7bbb02566a1e7041ca096d49fc8145.tar.bz2 scummvm-rg350-41574458fc7bbb02566a1e7041ca096d49fc8145.zip | |
Added animation handler for standard characters that can be talked to
svn-id: r25888
Diffstat (limited to 'engines/lure')
| -rw-r--r-- | engines/lure/hotspots.cpp | 11 | ||||
| -rw-r--r-- | engines/lure/hotspots.h | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index 2a06385a96..787ca6b1b1 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -1966,8 +1966,6 @@ HandlerMethodPtr HotspotTickHandlers::getHandler(uint16 procOffset) { return voiceBubbleAnimHandler; case PUZZLED_TICK_PROC_ID: return puzzledAnimHandler; - case 0x7F3A: - return standardAnimHandler; case 0x7207: return roomExitAnimHandler; case PLAYER_TICK_PROC_ID: @@ -1976,6 +1974,10 @@ HandlerMethodPtr HotspotTickHandlers::getHandler(uint16 procOffset) { return followerAnimHandler; case 0x7EFA: return skorlAnimHandler; + case 0x7F37: + return standardAnimHandler2; + case 0x7F3A: + return standardAnimHandler; case 0x7F69: return droppingTorchAnimHandler; case 0x7FA1: @@ -2008,6 +2010,11 @@ void HotspotTickHandlers::standardAnimHandler(Hotspot &h) { h.executeScript(); } +void HotspotTickHandlers::standardAnimHandler2(Hotspot &h) { + h.handleTalkDialog(); + standardCharacterAnimHandler(h); +} + void HotspotTickHandlers::standardCharacterAnimHandler(Hotspot &h) { Resources &res = Resources::getReference(); ValueTableData &fields = res.fieldList(); diff --git a/engines/lure/hotspots.h b/engines/lure/hotspots.h index 94ff4aa277..701d3fa86d 100644 --- a/engines/lure/hotspots.h +++ b/engines/lure/hotspots.h @@ -58,6 +58,7 @@ private: static void defaultHandler(Hotspot &h); static void voiceBubbleAnimHandler(Hotspot &h); static void standardAnimHandler(Hotspot &h); + static void standardAnimHandler2(Hotspot &h); static void standardCharacterAnimHandler(Hotspot &h); static void puzzledAnimHandler(Hotspot &h); static void roomExitAnimHandler(Hotspot &h); |