From f09c0a4b6ca7c441e2b305faf5c89629a1081cc5 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 8 Dec 2023 12:38:23 +0000
Subject: [PATCH] Forgot to commit compilation corrections last night

- Fix repeat for GDGONER_VIDEO text
- M_GonerSurveyResponse
---
 src/menus/main-goner.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/menus/main-goner.cpp b/src/menus/main-goner.cpp
index dccf1ddd7..2e5a3851e 100644
--- a/src/menus/main-goner.cpp
+++ b/src/menus/main-goner.cpp
@@ -464,16 +464,6 @@ void M_GonerTick(void)
 
 	M_GonerResetLooking(GDGONER_INIT);
 
-	if (gamedata->gonerlevel != lastseenlevel)
-	{
-		if (goner_levelworking >= gamedata->gonerlevel)
-		{
-			// If the valid range has changed, try the current one again
-			goner_levelworking--;
-		}
-		lastseenlevel = gamedata->gonerlevel;
-	}
-
 	if (first)
 	{
 		first = goner_gdq = false;
@@ -487,6 +477,18 @@ void M_GonerTick(void)
 			gamedata->gonerlevel = GDGONER_INTRO;
 
 		M_GonerRailroad(false);
+
+		lastseenlevel = gamedata->gonerlevel;
+	}
+	else if (gamedata->gonerlevel != lastseenlevel)
+	{
+		if (goner_levelworking >= gamedata->gonerlevel)
+		{
+			// If the valid range has changed, try the current one again
+			goner_levelworking--;
+		}
+
+		lastseenlevel = gamedata->gonerlevel;
 	}
 
 	goner_typewriter.WriteText();
@@ -529,7 +531,7 @@ void M_GonerTick(void)
 		else if (goner_levelworking <= gamedata->gonerlevel)
 		{
 			if (goner_levelworking == GDGONER_INTRO && gamedata->gonerlevel < GDGONER_VIDEO)
-				gamedata->gonerlevel = GDGONER_VIDEO;
+				gamedata->gonerlevel = lastseenlevel = GDGONER_VIDEO;
 
 			if (++goner_levelworking > gamedata->gonerlevel)
 			{
@@ -658,9 +660,9 @@ void M_GonerProfile(INT32 choice)
 	M_GonerResetLooking(GDGONER_PROFILE);
 }
 
-static boolean M_GonerSurveyResponse(INT32 ch)
+static void M_GonerSurveyResponse(INT32 ch)
 {
-	if (ch != CH_YES)
+	if (ch != MA_YES)
 		return;
 
 	if (gamedata->gonerlevel < GDGONER_OUTRO)