Skip to content

unify(worldbuilder): Merge Generals and Zero Hour WorldBuilder - #2

Closed
OmarAglan wants to merge 1 commit into
unify/worldbuilder-prerequisitesfrom
unify/worldbuilder-merge
Closed

unify(worldbuilder): Merge Generals and Zero Hour WorldBuilder#2
OmarAglan wants to merge 1 commit into
unify/worldbuilder-prerequisitesfrom
unify/worldbuilder-merge

Conversation

@OmarAglan

@OmarAglan OmarAglan commented Jul 28, 2026

Copy link
Copy Markdown
Owner

What changed

  • Synchronized the Generals and Zero Hour WorldBuilder source and resource trees.
  • Added the richer Zero Hour editor features to Generals, including ruler support, team object properties, layers, ambient-sound editing, and the expanded editor resources.
  • Preserved game-specific behavior through RTS_GENERALS and RTS_ZEROHOUR guards.
  • Preserved the Generals blend-tile serialization version and camera-direction controls.

Why

WorldBuilder had diverged between Generals and Zero Hour. The implementations must be behaviorally aligned before one shared copy can be moved to Core.

Impact

Both games retain their own WorldBuilder targets in this PR, but their 198 source/header files and shared resources are now identical.

Validation

  • Generals and Zero Hour source/header trees compare identically
  • All 198 source/header files are present in both CMake manifests
  • Shared resource hashes match, excluding the intentional game-specific splash bitmap
  • git diff --check
  • Exactly one commit relative to the prerequisite branch

Stack

2 of 3. Depends on TheSuperHackers#3024 (unify/worldbuilder-prerequisites).

@OmarAglan
OmarAglan force-pushed the unify/worldbuilder-prerequisites branch from f749bac to 628bfe3 Compare July 28, 2026 10:44
@OmarAglan
OmarAglan force-pushed the unify/worldbuilder-merge branch from 93db098 to c56bc00 Compare July 28, 2026 10:44
@OmarAglan

Copy link
Copy Markdown
Owner Author

Superseded by TheSuperHackers#3025.

@OmarAglan OmarAglan closed this Jul 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant