OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- a few minor fixes.

Browse source
This commit is contained in:
Christoph Oelckers 2019-02-01 12:31:08 +01:00
commit 2903025268
5 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_conversation.cpp
View file

@ -739,7 +739,7 @@ void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveang
int i;
// Make sure this is actually a player.
if (pc == nullptr || pc->player == nullptr || npc == nullptr || pc->Level != currentUILevel) return;
if (pc == nullptr || pc->player == nullptr || npc == nullptr || !pc->Level->isPrimaryLevel()) return;
auto Level = pc->Level;
// [CW] If an NPC is talking to a PC already, then don't let