OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- handled approx. half of all cases where the address of level is taken.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-28 00:55:21 +01:00
commit 648e472744
38 changed files with 122 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_conversation.cpp
View file

@ -739,7 +739,7 @@ void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveang
// Make sure this is actually a player.
if (pc == nullptr || pc->player == nullptr || npc == nullptr) return;
auto Level = &level;
auto Level = pc->Level;
// [CW] If an NPC is talking to a PC already, then don't let
// anyone else talk to the NPC.
@ -887,7 +887,7 @@ static void HandleReply(player_t *player, bool isconsole, int nodenum, int reply
AActor *npc;
bool takestuff;
int i;
auto Level = &level;
auto Level = player->mo->Level;
if (player->ConversationNPC == nullptr || (unsigned)nodenum >= Level->StrifeDialogues.Size())
{
return;