From d5e23ea06b4a6cd027c29eabf2d17f70cac65223 Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:48:47 +0100
Subject: [PATCH] unify(common): Merge TerrainTypes from Zero Hour

---
 .../GameEngine/Include/Common/TerrainTypes.h  | 42 +++++++++++++++++--
 .../GameEngine/Include/Common/TerrainTypes.h  |  4 --
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h
index 3333c3c05fa..e29943bfeb2 100644
--- a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h
+++ b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h
@@ -56,8 +56,6 @@ typedef enum
 	TERRAIN_SNOW_3,
 
 	// remove all the terrain types below when Todd says he's redone them all
-	TERRAIN_ASPHALT,
-	TERRAIN_CONCRETE,
 	TERRAIN_DIRT,
 	TERRAIN_GRASS,
 	TERRAIN_TRANSITION,
@@ -67,6 +65,25 @@ typedef enum
 	TERRAIN_WOOD,
 	TERRAIN_BLEND_EDGES,
 
+	// New terrain types (for Samm Ivri)
+	TERRAIN_LIVE_DESERT,
+	TERRAIN_DRY_DESERT,
+	TERRAIN_ACCENT_SAND,
+	TERRAIN_TROPICAL_BEACH,
+	TERRAIN_BEACH_PARK,
+	TERRAIN_RUGGED_MOUNTAIN,
+	TERRAIN_COBBLESTONE_GRASS,
+	TERRAIN_ACCENT_GRASS,
+	TERRAIN_RESIDENTIAL,
+	TERRAIN_RUGGED_SNOW,
+	TERRAIN_FLAT_SNOW,
+	TERRAIN_FIELD,
+	TERRAIN_ASPHALT,
+	TERRAIN_CONCRETE,
+	TERRAIN_CHINA,
+	TERRAIN_ACCENT_ROCK,
+	TERRAIN_URBAN,
+
 	TERRAIN_NUM_CLASSES
 
 } TerrainClass;
@@ -88,8 +105,6 @@ static const char *const terrainTypeNames[] =
 	"SNOW_3",
 
 	// remove all the terrain types below when Todd says he's redone them all
-	"ASPHALT",
-	"CONCRETE",
 	"DIRT",
 	"GRASS",
 	"TRANSITION",
@@ -99,6 +114,25 @@ static const char *const terrainTypeNames[] =
 	"WOOD",
 	"BLEND_EDGE",
 
+		// New terrain types (for Samm Ivri)
+	"DESERT_LIVE",
+	"DESERT_DRY",
+	"SAND_ACCENT",
+	"BEACH_TROPICAL",
+	"BEACH_PARK",
+	"MOUNTAIN_RUGGED",
+	"GRASS_COBBLESTONE",
+	"GRASS_ACCENT",
+	"RESIDENTIAL",
+	"SNOW_RUGGED",
+	"SNOW_FLAT",
+	"FIELD",
+	"ASPHALT",
+	"CONCRETE",
+	"CHINA",
+	"ROCK_ACCENT",
+	"URBAN",
+
 	nullptr
 };
 static_assert(ARRAY_SIZE(terrainTypeNames) == TERRAIN_NUM_CLASSES + 1, "Incorrect array size");
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h
index de3984df9ae..8450aecc320 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h
@@ -56,8 +56,6 @@ typedef enum
 	TERRAIN_SNOW_3,
 
 	// remove all the terrain types below when Todd says he's redone them all
-	//TERRAIN_ASPHALT,
-	//TERRAIN_CONCRETE,
 	TERRAIN_DIRT,
 	TERRAIN_GRASS,
 	TERRAIN_TRANSITION,
@@ -107,8 +105,6 @@ static const char *const terrainTypeNames[] =
 	"SNOW_3",
 
 	// remove all the terrain types below when Todd says he's redone them all
-	//"ASPHALT",
-	//"CONCRETE",
 	"DIRT",
 	"GRASS",
 	"TRANSITION",