From 8a7df9678e2c20928204907d08426de0333008d5 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 24 Jul 2025 19:28:27 +0100
Subject: [PATCH] Add photosensitivity warning to Goner

Allows you to turn on reducevfx, screenshake, and screen tilting with one confirm input
Shows up every time game boots just in case you get into Sunbeam and it's too much and need to restart
(also dummied out Kickstart Accel option)
---
 src/k_menu.h                   |  2 +-
 src/k_menufunc.c               |  2 +-
 src/menus/main-goner.cpp       | 96 +++++++++++++++++++++++++++++++++-
 src/menus/options-profiles-1.c |  6 +++
 4 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/src/k_menu.h b/src/k_menu.h
index 50bba91e5..3b1151aae 100644
--- a/src/k_menu.h
+++ b/src/k_menu.h
@@ -222,7 +222,7 @@ typedef enum
 	quitkart
 } main_e;
 
-extern menuitem_t MAIN_Goner[];
+extern menu_t MAIN_GonerAccessibilityDef;
 extern menu_t MAIN_GonerDef;
 
 void M_GonerTick(void);
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 78842740f..be6dcc2a3 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -847,7 +847,7 @@ void M_StartControlPanel(void)
 			// Are you ready for the First Boot Experience?
 			M_ResetOptions();
 
-			currentMenu = &MAIN_GonerDef;
+			currentMenu = &MAIN_GonerAccessibilityDef;
 			restoreMenu = NULL;
 
 			M_PlayMenuJam();
diff --git a/src/menus/main-goner.cpp b/src/menus/main-goner.cpp
index a0e9675e3..16df4fe2e 100644
--- a/src/menus/main-goner.cpp
+++ b/src/menus/main-goner.cpp
@@ -36,9 +36,99 @@ static void M_GonerChoiceDrawer(void);
 static void M_GonerConclude(INT32 choice);
 static boolean M_GonerInputs(INT32 ch);
 
-menuitem_t MAIN_Goner[] =
+static menuitem_t MAIN_GonerAccessibility[] =
 {
-	{IT_STRING | IT_CALL, NULL, NULL, NULL, {.routine = M_QuitSRB2}, 0, 0}, // will be replaced
+	{IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0},
+};
+
+static UINT32 goneraccessibilitytick = 0;
+
+//#define HANDSTRAIN
+
+#ifdef HANDSTRAIN
+static void M_GonerHandStrain(INT32 ch)
+{
+	if (ch != MA_YES)
+		return;
+
+	CV_StealthSet(&cv_kickstartaccel[0], "On");
+}
+#endif
+
+static void M_GonerPhotosensitivity(INT32 ch)
+{
+	if (ch == MA_YES)
+	{
+		CV_StealthSet(&cv_reducevfx, "Yes");
+		CV_StealthSet(&cv_screenshake, "Off");
+		CV_StealthSet(&cv_tilting, "Off");
+	}
+
+#ifdef HANDSTRAIN
+	M_StartMessage("Hand strain warning",
+		"You may be required to press many buttons\n"
+		"at once in order to control your Ring Racer.\n"
+		"\n"
+		"There is an option for your Accel input\n"
+		"to \"lock\" on after being held for 1 second.\n"
+		"Would you like to turn it on?\n"
+		, &M_GonerHandStrain, MM_YESNO, "Yes, I want Accel to \"lock\"", "No thanks");
+#endif
+}
+
+static void M_GonerAccessibilityTick(void)
+{
+	if (goneraccessibilitytick)
+	{
+		if (!menumessage.active && !menutransition.dest)
+		{
+			M_SetupNextMenu(&MAIN_GonerDef, true);
+		}
+
+		return;
+	}
+
+	goneraccessibilitytick++;
+
+	M_StartMessage("Photosensitivity warning",
+		"This game has ""\x87""flashing lights and high-contrast\n"
+		"patterns.""\x80"" Listen to your body, and\n"
+		"stop playing if you feel unwell.\n"
+		"\n"
+		"There is a ""\x88""special mode""\x80"" to reduce some\n"
+		"visual effects. Would you like to turn it on?\n"
+		, &M_GonerPhotosensitivity, MM_YESNO, "Yes, reduce effects", "No thanks");
+	return;
+}
+
+static void M_GonerAccessibilityDrawer(void)
+{
+	V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
+}
+
+menu_t MAIN_GonerAccessibilityDef = {
+	sizeof (MAIN_GonerAccessibility) / sizeof (menuitem_t),
+	NULL,
+	0,
+	MAIN_GonerAccessibility,
+	26, 160,
+	0, 0,
+	MBF_CANTRESTORE,
+	"_GONER",
+	0, 0,
+	M_GonerAccessibilityDrawer,
+	NULL,
+	M_GonerAccessibilityTick,
+	NULL,
+	NULL,
+	NULL,
+};
+
+static menuitem_t MAIN_Goner[] =
+{
+	{IT_STRING | IT_CVAR | IT_CV_STRING, "PASSWORD",
+		"ATTEMPT ADMINISTRATOR ACCESS.", NULL,
+		{.cvar = &cv_dummyextraspassword}, 0, 0},
 
 	{IT_STRING | IT_CALL, "EXIT PROGRAM",
 		"CONCLUDE OBSERVATIONS NOW.", NULL,
@@ -887,10 +977,12 @@ void M_GonerTick(void)
 
 		first = goner_gdq = false;
 
+#if 0
 		MAIN_Goner[0] =
 			{IT_STRING | IT_CVAR | IT_CV_STRING, "PASSWORD",
 				"ATTEMPT ADMINISTRATOR ACCESS.", NULL,
 				{.cvar = &cv_dummyextraspassword}, 0, 0};
+#endif
 
 		if (gamedata->gonerlevel < GDGONER_INTRO)
 			gamedata->gonerlevel = GDGONER_INTRO;
diff --git a/src/menus/options-profiles-1.c b/src/menus/options-profiles-1.c
index 8f61f01cd..85e1fd73d 100644
--- a/src/menus/options-profiles-1.c
+++ b/src/menus/options-profiles-1.c
@@ -83,6 +83,12 @@ void M_StartEditProfile(INT32 c)
 			PR_InitNewProfile();	// initialize the new profile.
 
 		optionsmenu.profile = PR_GetProfile(optionsmenu.profilen);
+		if (cv_kickstartaccel[0].value)
+		{
+			// Primarily for Goner but should help with standard set-up too
+			optionsmenu.profile->kickstartaccel = true;
+		}
+
 		// copy this profile's controls into optionsmenu so that we can edit controls without changing them directly.
 		// we do this so that we don't edit a profile's controls in real-time and end up doing really weird shit.
 		memcpy(&optionsmenu.tempcontrols, optionsmenu.profile->controls, sizeof(gamecontroldefault));