From 14e04ff360b9769b142acf4cbb3c1a690330893b Mon Sep 17 00:00:00 2001
From: Indev <bdmitry450@gmail.com>
Date: Mon, 15 Dec 2025 20:02:00 +0300
Subject: [PATCH] Fix mapheaderinfo[i] always returning green hills mapheader
 for invalid map id

---
 src/deh_soc.c | 2 +-
 src/g_game.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/deh_soc.c b/src/deh_soc.c
index 503567daf..ae4994be6 100644
--- a/src/deh_soc.c
+++ b/src/deh_soc.c
@@ -860,7 +860,7 @@ void readlevelheader(MYFILE *f, char * name)
 		if (exnum >= NEXTMAP_SPECIAL)
 			I_Error("Ran out of compatibility map slots");
 	}
-	kartmap2native[exnum-1] = num;
+	kartmap2native[exnum-1] = num+1;
 	nativemap2kart[num] = exnum-1;
 
 	if (mapheaderinfo[num]->lumpname == NULL)
diff --git a/src/g_game.c b/src/g_game.c
index f82942655..875deb445 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1090,7 +1090,7 @@ INT32 G_LevelTitleToMapNum(const char * leveltitle)
 INT16 G_KartMapToNative(INT16 mapnum)
 {
 	if (mapnum > 0 && mapnum < NEXTMAP_SPECIAL)
-		return kartmap2native[mapnum-1]+1;
+		return kartmap2native[mapnum-1];
 	return 0;
 }