diff --git a/src/d_event.h b/src/d_event.h index 4aeb4979c0..ef54c3a0ff 100644 --- a/src/d_event.h +++ b/src/d_event.h @@ -76,6 +76,7 @@ enum gameaction_t : int ga_screenshot, ga_togglemap, ga_fullconsole, + ga_resumeconversation, }; diff --git a/src/g_game.cpp b/src/g_game.cpp index 0f783ad070..6bfe200e06 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -74,6 +74,7 @@ #include "gi.h" #include "a_dynlight.h" #include "i_system.h" +#include "p_conversation.h" #include "g_hub.h" #include "g_levellocals.h" @@ -1095,6 +1096,10 @@ void G_Ticker () AM_ToggleMap (); gameaction = ga_nothing; break; + case ga_resumeconversation: + P_ResumeConversation (); + gameaction = ga_nothing; + break; default: case ga_nothing: break; diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp index cc24822201..3e03035c10 100644 --- a/src/intermission/intermission.cpp +++ b/src/intermission/intermission.cpp @@ -804,7 +804,7 @@ void DIntermissionController::Ticker () primaryLevel->SetMusic(); gamestate = GS_LEVEL; wipegamestate = GS_LEVEL; - P_ResumeConversation (); + gameaction = ga_resumeconversation; viewactive = true; Destroy(); break;