Skip to content

Use kind from GameDataLoader#54

Merged
Flamefire merged 3 commits into
Return-To-The-Roots:masterfrom
morganchristiansson:gdl-kind
Jun 30, 2026
Merged

Use kind from GameDataLoader#54
Flamefire merged 3 commits into
Return-To-The-Roots:masterfrom
morganchristiansson:gdl-kind

Conversation

@morganchristiansson

Copy link
Copy Markdown
Contributor

Instead of current hardcoded values.
GameDataLoader loads them from data/RTTR/gamedata/world/*.lua

Comment thread CMap.cpp Outdated
Comment thread CMap.cpp Outdated
Comment thread CMap.cpp Outdated
Comment thread CMap.cpp Outdated
Comment thread CSurface.cpp
Comment thread CSurface.cpp Outdated
Comment thread CSurface.cpp Outdated
Comment thread CSurface.cpp Outdated
@morganchristiansson

Copy link
Copy Markdown
Contributor Author

Rebase initial commit on master.
Added commit to address all feedback.
The building help overlay was displaying castle was allowed everywhere, so did further fix for that. Uses TerrainDesc::GetBQ() from s25main.

@morganchristiansson

morganchristiansson commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Also apologies I didn't test original PR enough.
Was supposed to be very simple refactor to replace hardcoded data with GDL but changes were more extensive and sloppy.
Great feedback - thank you!

@Flamefire Flamefire merged commit 49ab5db into Return-To-The-Roots:master Jun 30, 2026
1 check passed
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.

2 participants