zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed: The DConversationMenu constructor is not the appropriate place to set menuactive to 

MENU_OnNoPause.

SVN r3396 (trunk)
This commit is contained in:
Randy Heit 2012-02-28 02:07:06 +00:00
parent d59280eadb
commit fcb0840246
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_conversation.cpp
View File

@ -727,7 +727,6 @@ public:
DConversationMenu(FStrifeDialogueNode *CurNode) DConversationMenu(FStrifeDialogueNode *CurNode)
{ {
menuactive = MENU_OnNoPause;
mCurNode = CurNode; mCurNode = CurNode;
mDialogueLines = NULL; mDialogueLines = NULL;
mShowGold = false; mShowGold = false;
@ -1171,6 +1170,7 @@ void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveang
M_StartControlPanel (false); M_StartControlPanel (false);
M_ActivateMenu(cmenu); M_ActivateMenu(cmenu);
ConversationPauseTic = gametic + 20; ConversationPauseTic = gametic + 20;
menuactive = MENU_OnNoPause;
} }
} }