libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix for characters freezing after talking when in a different room than the player, and fixed NPC to NPC conversations

Browse Source 
svn-id: r26740
This commit is contained in:
Paul Gilbert 2007-05-03 05:06:10 +00:00
parent 463c5fcec8
commit aba02a6811
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/lure/hotspots.cpp
View File

@ -780,7 +780,8 @@ void Hotspot::handleTalkDialog() {
// Talking is finish - stop talking and free voice animation
debugC(ERROR_DETAILED, kLureDebugAnimations, "Talk dialog close");
room.setTalkDialog(0, 0, 0, 0);
res.setTalkingCharacter(0);
_data->talkDestCharacterId = 0;
_data->talkGate = 0;
}
debugC(ERROR_DETAILED, kLureDebugAnimations, "Talk handler method end");
@ -1924,7 +1925,7 @@ void Hotspot::npcTalkNpcToNpc(HotspotData *hotspot) {
// Handle the source's talk message
if (entry.param(1) != 0) {
converse(hotspot->hotspotId, entry.param(1));
resource()->talkCountdown = entry.param(2);
resource()->talkCountdown += entry.param(2);
resource()->delayCtr = entry.param(2);
}

8
engines/lure/luredefs.h
View File

@ -85,16 +85,16 @@ enum Action {
BRIBE = 24,
EXAMINE = 25,
NPC_SET_ROOM_AND_OFFSET = 28,
NPC_UNKNOWN1 = 29,
NPC_TALK_TO_PLAYER = 29,
NPC_EXEC_SCRIPT = 30,
NPC_UNKNOWN2 = 31,
NPC_RESET_PAUSED_LIST = 31,
NPC_SET_RAND_DEST = 32,
NPC_WALKING_CHECK = 33,
NPC_SET_SUPPORT_OFFSET = 34,
NPC_SUPPORT_OFFSET_COND = 35,
NPC_DISPATCH_ACTION = 36,
NPC_UNKNOWN3 = 37,
NPC_UNKNOWN4 = 38,
NPC_TALK_NPC_TO_NPC = 37,
NPC_PAUSE = 38,
NPC_START_TALKING = 39,
NPC_JUMP_ADDRESS = 40
};