bugfix(worldbuilder): Keep new and resized maps within the map size limit

[tintinhamans]

⚠️ Merge with Rebase

---

This change has 2 commits: resize-memory fixes first, then map-size validation.

The new map and resize dialog accepts sizes the loader rejects. isValidTotalMapSize enforces MAX_MAP_DIMENSION and MAX_MAP_AREA on dimensions that include the border. isValidPlayableMapSize checks that adding the border cannot overflow, then calls the same validator. WorldBuilder validates creation, resizing and saved defaults, and warns above 1024x1024.

resize also keeps the extra height-data row allocated by the constructor, frees its arrays with delete[], and clears the new flip and cliff state.

[coderabbitai]

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

• Last reviewed commit: f985cba

Use the following commands to manage reviews:

• @coderabbitai resume to resume automatic reviews.
• @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

• ▶️ Resume reviews
• 🔍 Trigger review

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

• Configuration used: Organization UI
• Review profile: CHILL
• Plan: Advanced
• Run ID: f0fb0a21-8f5e-4a82-85c5-587af5452a68

📥 Commits

Reviewing files that changed from the base of the PR and between 0e70107 and f985cba.

📒 Files selected for processing: 4

• Core/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h
• Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
• Generals/Code/Tools/WorldBuilder/src/NewHeightMap.cpp
• GeneralsMD/Code/Tools/WorldBuilder/src/NewHeightMap.cpp

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 2 remain after this review.

Walkthrough

WorldHeightMap now separates total-map and playable-map size validation. Both WorldBuilder variants use playable-size checks when creating or resizing maps and when loading configured defaults. New-map dialogs request confirmation when the bordered map area exceeds 1024² cells.

Changes

Height-map validation

Layer / File(s)	Summary
Total and playable map-size checks Core/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h, Core/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp	WorldHeightMap replaces isValidMapSize with isValidTotalMapSize and adds isValidPlayableMapSize. The validators check dimensions, borders, and map area. Height-map parsers validate loaded dimensions as total-map sizes.
Editor validation and resizing Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp, GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp	Both variants validate playable dimensions when constructing or resizing an editor map. Resizing changes height-data allocation, uses array deletion for buffers, and initializes cliff and flip state arrays.
Map creation and default dimensions Generals/Code/Tools/WorldBuilder/src/NewHeightMap.cpp, GeneralsMD/Code/Tools/WorldBuilder/src/NewHeightMap.cpp, Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp, GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp	Both new-map dialogs reject invalid playable sizes and request confirmation when bordered area exceeds 1024² cells. Both document implementations replace invalid configured dimensions and borders with defaults.

Priority: ⬇️ Low

Estimated code review effort: 3 (Moderate) | ~20 minutes

Change: Bug fix

Suggested reviewers: xezon

Merge Risk: ⚪ Minimal · up to f985c

This change makes WorldBuilder's new-map and resize dialogs reject sizes the loader would refuse, and warns before creating very large maps. No actionable merge-blocking risk remains in the supplied evidence.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title clearly summarizes the main change: preventing new and resized WorldBuilder maps from exceeding the map size limit.
Description check		The description directly explains map-size validation, WorldBuilder coverage, resize memory fixes, and the 1024×1024 warning.
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[greptile-apps]

Confidence Score: 5/5

[Medium impact] The PR appears safe to merge; no blocking issues were found.

Summary

WorldBuilder now checks border-inclusive map limits before creating or resizing maps in both game editions.

• WorldBuilder keeps new and resized maps within the loader’s size limits.
• Resizing maps prepares the height and state buffers for the new dimensions.

No actionable new issues were found. No previous review threads were supplied.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  A[Saved dimensions] --> B{Valid playable size?}
  B -->|No| C[Use safe defaults]
  B -->|Yes| D[New document]
  C --> D
  E[Create or resize dialog] --> F{Valid border-inclusive size?}
  F -->|No| G[Keep dialog open]
  F -->|Yes| H{Above warning threshold?}
  H -->|Yes| I[Ask user to continue]
  H -->|No| J[Create or resize map]
  I -->|Continue| J

Loading

_{Reviews (14) · Last reviewed commit: "fix(wheightmapedit): Validate new and re..." · Reviewed by Greptile}

[Mauller]

As WWB2 mentioned in the other PR, we might want to limit the map Area rather than hard limit dimensions, since it's the overall area that causes problems and not just individual dimensions.

So the Max area being 4096 squared etc

[tintinhamans]

As WWB2 mentioned in the other PR, we might want to limit the map Area rather than hard limit dimensions, since it's the overall area that causes problems and not just individual dimensions.

So the Max area being 4096 squared etc

The limit is now an area of 4096x4096. Each side is still capped at 8192 because shoreline tiles pack coordinates into 16 bits and the shroud texture spans the map.

[Mauller]

LGTM

[xezon]

Needs rebase?

[coderabbitai]

Actionable comments posted: 1

---

ℹ️ Review info

⚙️ Run configuration

• Configuration used: Organization UI
• Review profile: CHILL
• Plan: Advanced
• Run ID: 53dcd0b2-9b8e-4756-a3d8-b91caf5b9538

📥 Commits

Reviewing files that changed from the base of the PR and between 17859d5 and 89141b1.

📒 Files selected for processing: 4

• Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h
• Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
• GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h
• GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 3 remain after this review.

[xezon]

Why do we need 2 different map validation methods? It looks like world builder uses a different one than game does.

[tintinhamans]

Why do we need 2 different map validation methods? It looks like world builder uses a different one than game does.

both use the same validator now. the playable wrapper just safely adds the border before calling it.

[xezon]

OK