- route all accesses to gameaction from the backend through the sysCa…

…llbacks.

gameactions are frontend specific so this needs to be decoupled.

src/common/console/c_console.cpp

@@ -592,8 +592,7 @@ void C_DrawConsole ()
 
 	oldbottom = ConBottom;
 
-	if (ConsoleState == c_up && gamestate != GS_INTRO && gamestate != GS_INTERMISSION && 
-		gamestate != GS_FULLCONSOLE && gamestate != GS_MENUSCREEN)
+	if (ConsoleState == c_up && gamestate == GS_LEVEL)
 	{
 		if (NotifyStrings) NotifyStrings->Draw();
 		return;
@@ -731,7 +730,7 @@ void C_ToggleConsole ()
 	}
 	if (gamestate == GS_MENUSCREEN)
 	{
-		gameaction = ga_fullconsole;
+		if (sysCallbacks.ToggleFullConsole) sysCallbacks.ToggleFullConsole();
 		togglestate = c_down;
 	}
 	else if (!chatmodeon && (ConsoleState == c_up || ConsoleState == c_rising) && menuactive == MENU_Off)

src/common/cutscenes/screenjob.cpp

@@ -50,6 +50,7 @@
 #include "c_dispatch.h"
 #include "s_music.h"
 #include "m_argv.h"
+#include "i_interface.h"
 
 CVAR(Bool, inter_subtitles, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
 
@@ -316,7 +317,7 @@ bool StartCutscene(CutsceneDef& cs, int flags, const CompletionFunc& completion_
 			}
 			if (flags & SJ_DELAY) intermissiondelay = 10;	// need to wait a bit at the start to let the timer catch up.
 			else intermissiondelay = 0;
-			gameaction = (flags & SJ_BLOCKUI) ? ga_intro : ga_intermission;
+			if (sysCallbacks.StartCutscene) sysCallbacks.StartCutscene(flags & SJ_BLOCKUI);
 		}
 		catch (...)
 		{

src/gamestate.h → src/common/engine/gamestate.h

@@ -14,6 +14,8 @@ enum gamestate_t : int
 	GS_STARTUP,			// [RH] Console is fullscreen, and game is just starting
 	GS_TITLELEVEL,		// [RH] A combination of GS_LEVEL and GS_DEMOSCREEN
 	GS_INTRO,
+	GS_CUTSCENE,
+
 	GS_MENUSCREEN = GS_DEMOSCREEN,
 
 	GS_FORCEWIPE = -1,
@@ -22,31 +24,6 @@ enum gamestate_t : int
 	GS_FORCEWIPEMELT = -4
 };
 
-extern	gamestate_t 	gamestate;
-
-enum gameaction_t : int
-{
-	ga_nothing,
-	ga_loadlevel, // not used.
-	ga_newgame,
-	ga_newgame2,
-	ga_recordgame,
-	ga_loadgame,
-	ga_loadgamehidecon,
-	ga_loadgameplaydemo,
-	ga_autoloadgame,
-	ga_savegame,
-	ga_autosave,
-	ga_playdemo,
-	ga_completed,
-	ga_slideshow,
-	ga_worlddone,
-	ga_screenshot,
-	ga_togglemap,
-	ga_fullconsole,
-	ga_resumeconversation,
-	ga_intro,
-	ga_intermission,
-};
 
-extern	gameaction_t 	gameaction;
+extern	gamestate_t 	gamestate;
+extern int intermissiondelay;

src/common/engine/i_interface.h

@@ -32,6 +32,8 @@ struct SystemCallbacks
 	void (*ConsoleToggled)(int state);
 	bool (*PreBindTexture)(FRenderState* state, FGameTexture*& tex, EUpscaleFlags& flags, int& scaleflags, int& clampmode, int& translation, int& overrideshader);
 	void (*FontCharCreated)(FGameTexture* base, FGameTexture* untranslated, FGameTexture* translated);
+	void (*ToggleFullConsole)();
+	void (*StartCutscene)(bool blockui);
 };
 
 extern SystemCallbacks sysCallbacks;

src/d_event.h

@@ -75,6 +75,30 @@ typedef enum
 // Called by IO functions when input is detected.
 void D_Render(std::function<void()> action, bool interpolate);
 
+enum gameaction_t : int
+{
+	ga_nothing,
+	ga_loadlevel, // not used.
+	ga_newgame,
+	ga_newgame2,
+	ga_recordgame,
+	ga_loadgame,
+	ga_loadgamehidecon,
+	ga_loadgameplaydemo,
+	ga_autoloadgame,
+	ga_savegame,
+	ga_autosave,
+	ga_playdemo,
+	ga_completed,
+	ga_slideshow,
+	ga_worlddone,
+	ga_screenshot,
+	ga_togglemap,
+	ga_fullconsole,
+	ga_resumeconversation,
+	ga_intro,
+	ga_intermission,
+};
 
 extern	gameaction_t	gameaction;
 

src/d_main.cpp

@@ -3042,6 +3042,17 @@ static void GC_MarkGameRoots()
 	GC::Mark(NextToThink);
 }
 
+static void System_ToggleFullConsole()
+{
+	gameaction = ga_fullconsole;
+}
+
+static void System_StartCutscene(bool blockui)
+{
+	gameaction = blockui ? ga_intro : ga_intermission;
+}
+
+
 bool  CheckSkipGameOptionBlock(const char* str);
 
 //==========================================================================
@@ -3090,6 +3101,10 @@ static int D_DoomMain_Internal (void)
 		nullptr,
 		CheckSkipGameOptionBlock,
 		System_ConsoleToggled,
+		nullptr, 
+		nullptr,
+		System_ToggleFullConsole,
+		System_StartCutscene,
 	};
 
 

src/g_game.cpp

@@ -77,6 +77,7 @@
 #include "v_palette.h"
 #include "s_music.h"
 #include "p_setup.h"
+#include "d_event.h"
 
 #include "v_video.h"
 #include "g_hub.h"

wadsrc/static/zscript/engine/base.zs

@@ -76,11 +76,14 @@ enum EGameState
 	GS_INTERMISSION,
 	GS_FINALE,
 	GS_DEMOSCREEN,
+	GS_FULLCONSOLE,		// [RH]	Fullscreen console
+	GS_HIDECONSOLE,		// [RH] The menu just did something that should hide fs console
+	GS_STARTUP,			// [RH] Console is fullscreen, and game is just starting
+	GS_TITLELEVEL,		// [RH] A combination of GS_LEVEL and GS_DEMOSCREEN
+	GS_INTRO,
+	GS_CUTSCENE,
+
 	GS_MENUSCREEN = GS_DEMOSCREEN,
-	GS_FULLCONSOLE,
-	GS_HIDECONSOLE,
-	GS_STARTUP,
-	GS_TITLELEVEL,
 }
 
 const TEXTCOLOR_BRICK			= "\034A";