OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Screenjob WIP stuff

Browse source
This commit is contained in:
Christoph Oelckers 2022-04-11 13:12:37 +02:00
commit 1bb750c061
13 changed files with 161 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/p_conversation.cpp
View file

@ -33,6 +33,7 @@
*/
#include <assert.h>
#include <stdint.h>
#include "actor.h"
#include "p_conversation.h"
@ -489,7 +490,7 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
if (!(npc->flags8 & MF8_DONTFACETALKER))
npc->Angles.Yaw = player->ConversationNPCAngle;
npc->flags5 &= ~MF5_INCONVERSATION;
if (gameaction != ga_slideshow) ClearConversationStuff(player);
if (gameaction != ga_intermission) ClearConversationStuff(player);
return;
}
@ -507,7 +508,7 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
if (!(npc->flags8 & MF8_DONTFACETALKER))
npc->Angles.Yaw = player->ConversationNPCAngle;
npc->flags5 &= ~MF5_INCONVERSATION;
if (gameaction != ga_slideshow) ClearConversationStuff(player);
if (gameaction != ga_intermission) ClearConversationStuff(player);
return;
}
}
@ -548,7 +549,7 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
}
if (reply->GiveType->IsDescendantOf("SlideshowStarter"))
gameaction = ga_slideshow;
G_StartSlideshow(primaryLevel, NAME_None);
}
else
{
@ -617,7 +618,7 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
if (!(reply->CloseDialog))
{
if (gameaction != ga_slideshow)
if (gameaction != ga_intermission)
{
P_StartConversation (npc, player->mo, player->ConversationFaceTalker, false);
return;
@ -643,7 +644,7 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
// [CW] Set these to NULL because we're not using to them
// anymore. However, this can interfere with slideshows
// so we don't set them to NULL in that case.
if (gameaction != ga_slideshow)
if (gameaction != ga_intermission)
{
npc->flags5 &= ~MF5_INCONVERSATION;
ClearConversationStuff(player);