zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-01-31 10:40:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed stuck Strife dialogs

Browse source 
See http://forum.zdoom.org/viewtopic.php?t=50451 and http://forum.zdoom.org/viewtopic.php?t=48470
This commit is contained in:
alexey.lysiuk 2016-01-15 18:32:49 +02:00
parent b38d5b6fb9
commit a8e5b90667
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_conversation.cpp
View file

@ -1345,12 +1345,14 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
if (reply->NextNode != 0) if (reply->NextNode != 0)
{ {
int rootnode = npc->ConversationRoot; int rootnode = npc->ConversationRoot;
if (reply->NextNode < 0) unsigned next = (unsigned)(rootnode + (reply->NextNode < 0 ? -1 : 1) * reply->NextNode - 1);
if (next < StrifeDialogues.Size())
{ {
unsigned next = (unsigned)(rootnode - reply->NextNode - 1); npc->Conversation = StrifeDialogues[next];
if (gameaction != ga_slideshow && next < StrifeDialogues.Size())
if (gameaction != ga_slideshow)
{ {
npc->Conversation = StrifeDialogues[next];
P_StartConversation (npc, player->mo, player->ConversationFaceTalker, false); P_StartConversation (npc, player->mo, player->ConversationFaceTalker, false);
return; return;
} }
@ -1359,10 +1361,6 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
S_StopSound (npc, CHAN_VOICE); S_StopSound (npc, CHAN_VOICE);
} }
} }
else
{
npc->Conversation = StrifeDialogues[rootnode + reply->NextNode - 1];
}
} }
npc->angle = player->ConversationNPCAngle; npc->angle = player->ConversationNPCAngle;