Skip to content

unify(common): Merge TerrainTypes code from Zero Hour #2196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 1 commit into from
Jan 27, 2026
Merged

unify(common): Merge TerrainTypes code from Zero Hour #2196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 38 additions & 4 deletions Generals/Code/GameEngine/Include/Common/TerrainTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand All @@ -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",
Expand All @@ -99,6 +114,25 @@ static const char *const terrainTypeNames[] =
"WOOD",
"BLEND_EDGE",

// New terrain types (for Samm Ivri)
Comment thread
xezon marked this conversation as resolved.
"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",
Comment thread
xezon marked this conversation as resolved.
"URBAN",

nullptr
};
static_assert(ARRAY_SIZE(terrainTypeNames) == TERRAIN_NUM_CLASSES + 1, "Incorrect array size");
Expand Down
4 changes: 0 additions & 4 deletions GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down
Loading