From 55c660247346125c4b3b8ae8dd5ce1dabf1fdd21 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 18 Nov 2023 12:15:36 +0000
Subject: [PATCH] Review: Don't award map visitation when the tutorial
 challenge is queued up, either

---
 src/g_game.c  | 4 ++++
 src/y_inter.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/g_game.c b/src/g_game.c
index 467774a84..83a8c7563 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3626,6 +3626,10 @@ void G_UpdateVisited(void)
 	if (prevmap != gamemap-1)
 		return;
 
+	// Neither for tutorial skip material
+	if (nextmapoverride == NEXTMAP_TUTORIALCHALLENGE+1 || tutorialchallenge != TUTORIALSKIP_NONE)
+		return;
+
 	// Check if every local player wiped out.
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
diff --git a/src/y_inter.c b/src/y_inter.c
index 2a99f8030..486ede29b 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1906,7 +1906,8 @@ void Y_DetermineIntermissionType(void)
 	|| (modeattacking && (players[consoleplayer].pflags & PF_NOCONTEST))
 	// or for explicit requested skip (outside of modeattacking)
 	|| (modeattacking == ATTACKING_NONE && skipstats != 0)
-	|| (tutorialchallenge != TUTORIALSKIP_NONE))
+	// or tutorial skip material
+	|| (nextmapoverride == NEXTMAP_TUTORIALCHALLENGE || tutorialchallenge != TUTORIALSKIP_NONE))
 	{
 		intertype = int_none;
 		return;