From 55106624fb4e7ce51cc31b6c7a4fd3147ca39f6a Mon Sep 17 00:00:00 2001
From: GenericHeroGuy <genericheroguy@noreply.codeberg.org>
Date: Wed, 3 Dec 2025 21:41:10 +0100
Subject: [PATCH] Fix extra colormap crash on Virtual Highway (closes #188)

---
 src/d_main.cpp | 2 +-
 src/p_saveg.c  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index 1af4e6b74..bec023e07 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -94,7 +94,7 @@
 #define ASSET_HASH_TEXTURES_KART       0xb4211b2f32b6a291
 #define ASSET_HASH_CHARS_KART          0x1e68a3e01aa5c68b
 #define ASSET_HASH_MAPS_KART           0x38558ed00da41ce9
-#define ASSET_HASH_MAIN_PK3            0x6f29fc26ffc8ee60
+#define ASSET_HASH_MAIN_PK3            0x2bc4973ae1beb107
 #define ASSET_HASH_MAPPATCH_PK3        0x0afd8afc6fc50175
 #define ASSET_HASH_BONUSCHARS_KART     0x60e6f13d822a7461
 #ifdef USE_PATCH_FILE
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 54291a256..65dd5f07f 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -1308,7 +1308,8 @@ static void DiffSectors(const sector_t *ss, const sector_t *spawnss, UINT8 diff[
 		SETB(SD_TAG);
 
 	//DIFFNE(ss, ..., SD__UNUSED);
-	DIFFNE(ss, extra_colormap, SD_COLORMAP);
+	if (ss->extra_colormap != ss->spawn_extra_colormap)
+		SETB(SD_COLORMAP);
 	DIFFIF(ss, crumblestate, SD_CRUMBLESTATE);
 	if (ss->floorlightlevel != spawnss->floorlightlevel || ss->floorlightabsolute != spawnss->floorlightabsolute)
 		SETB(SD_FLOORLIGHT);