OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/origin/master' into localization

Browse source 
# Conflicts:
#	src/v_font.cpp
This commit is contained in:
Christoph Oelckers 2019-02-16 17:35:15 +01:00
commit d15e3391a0
11 changed files with 421 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/p_conversation.cpp
View file

@ -544,6 +544,11 @@ static void ParseReplies (const char *name, int pos, FStrifeDialogueReply **repl
// The next node to use when this reply is chosen.
reply->NextNode = rsp->Link;
if (reply->NextNode < 0)
{
reply->NextNode *= -1;
reply->CloseDialog = false;
}
// The message to record in the log for this reply.
reply->LogNumber = rsp->Log;
@ -1090,14 +1095,13 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
if (reply->NextNode != 0)
{
int rootnode = npc->ConversationRoot;
const bool isNegative = reply->NextNode < 0;
const unsigned next = (unsigned)(rootnode + (isNegative ? -1 : 1) * reply->NextNode - 1);
const unsigned next = (unsigned)(rootnode + reply->NextNode - 1);
if (next < Level->StrifeDialogues.Size())
{
npc->Conversation = Level->StrifeDialogues[next];
if (isNegative)
if (!(reply->CloseDialog))
{
if (gameaction != ga_slideshow)
{