From 49f644d5e9776baf703ff7df9519ce32fe6ffa82 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Sat, 9 Mar 2024 12:20:16 -0600
Subject: [PATCH] Use correct type for unlock IDs in loading

---
 src/g_gamedata.cpp | 11 ++---------
 src/g_gamedata.h   |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/g_gamedata.cpp b/src/g_gamedata.cpp
index 050f7341e..20b6ddbfb 100644
--- a/src/g_gamedata.cpp
+++ b/src/g_gamedata.cpp
@@ -483,15 +483,8 @@ void srb2::load_ng_gamedata()
 				PU_STATIC, NULL));
 			for (size_t i = 0; i < std::min((size_t)(gamedata->challengegridwidth * CHALLENGEGRIDHEIGHT), js.challengegrid.grid.size()); i++)
 			{
-				int16_t gridvalue = js.challengegrid.grid[i];
-				if (gridvalue < 0)
-				{
-					gamedata->challengegrid[i] = MAXUNLOCKABLES;
-				}
-				else
-				{
-					gamedata->challengegrid[i] = static_cast<uint8_t>(gridvalue);
-				}
+				uint16_t gridvalue = js.challengegrid.grid[i];
+				gamedata->challengegrid[i] = gridvalue;
 			}
 
 			M_SanitiseChallengeGrid();
diff --git a/src/g_gamedata.h b/src/g_gamedata.h
index f479da427..0fb8ebe11 100644
--- a/src/g_gamedata.h
+++ b/src/g_gamedata.h
@@ -98,7 +98,7 @@ struct GamedataPrisonEggPickupsJson final
 struct GamedataChallengeGridJson final
 {
 	uint32_t width;
-	std::vector<int16_t> grid;
+	std::vector<uint16_t> grid;
 
 	NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(GamedataChallengeGridJson, width, grid)
 };