Skip to content
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.

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

Don't set Harbor distance for military buildings if sea attacks are disabled and fix crash when adding objects using player-textures via LUA #1479

Merged
merged 8 commits into from
Dec 15, 2021

Conversation

Flamefire
Copy link
Member

@Flamefire Flamefire commented Dec 10, 2021

Fixes #1477

Had to adjust the SeaWorldCreator for testing and simplified a bit of other code (use isEnabled)

I now also added the fix for #1464

@Flamefire Flamefire force-pushed the fix_harborDistanceFlag branch from effcb47 to b0310ce Compare December 10, 2021 20:39
@Flamefire Flamefire requested a review from Flow86 December 11, 2021 09:50
@Flamefire Flamefire force-pushed the fix_harborDistanceFlag branch 3 times, most recently from 92f165c to 4347bd8 Compare December 11, 2021 15:23
The adjustment of the Team from Random to specific should only be done for reading of (old) files, not in general or e.g. the settings transmitted when a player joins will be wrong
@Flamefire Flamefire force-pushed the fix_harborDistanceFlag branch from 4347bd8 to 2772b72 Compare December 11, 2021 15:54
Some map images are player images without player colors and hence are never uses as player images.
This abstraction allows to use them no matter what they are.
@Flamefire Flamefire force-pushed the fix_harborDistanceFlag branch from cc9abcc to 63689a6 Compare December 13, 2021 19:02
@Flamefire Flamefire changed the title Don't set Harbor distance for military buildings if sea attacks are disabled Don't set Harbor distance for military buildings if sea attacks are disabled and fix crash when adding objects using player-textures via LUA Dec 14, 2021
@Flow86 Flow86 merged commit a1875d6 into Return-To-The-Roots:master Dec 15, 2021
@Flamefire Flamefire deleted the fix_harborDistanceFlag branch December 15, 2021 20:42
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.

Disable near harbor indicator if no sea attacks
2 participants