Change: Allow locks under bridges #7200
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PeterN
added
the
wip
SamuXarick
reviewed
Feb 20, 2019
| @@ -423,7 +423,7 @@ CommandCost CmdBuildBridge(TileIndex end_tile, DoCommandFlag flags, uint32 p1, u | |||
|
|
|||
| switch (GetTileType(tile)) { | |||
| case MP_WATER: | |||
| if (!IsWater(tile) && !IsCoast(tile)) goto not_valid_below; | |||
| if (!IsWater(tile) && !IsCoast(tile) && !IsLock(tile)) goto not_valid_below; | |||
There was a problem hiding this comment.
Suggested change
| if (!IsWater(tile) && !IsCoast(tile) && !IsLock(tile)) goto not_valid_below; | |
| if (!IsWater(tile) && !IsCoast(tile) && !IsLock(tile)) goto not_valid_below; | |
| if (IsLock(tile) && GetLockPart(tile) == LOCK_PART_LOWER && GetTileMaxZ(tile) + 1 > z_start) return_cmd_error(STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN); |
SamuXarick
reviewed
Feb 20, 2019
| @@ -286,10 +286,6 @@ static CommandCost DoBuildLock(TileIndex tile, DiagDirection dir, DoCommandFlag | |||
| } | |||
| WaterClass wc_upper = IsWaterTile(tile + delta) ? GetWaterClass(tile + delta) : WATER_CLASS_CANAL; | |||
|
|
|||
| if (IsBridgeAbove(tile) || IsBridgeAbove(tile - delta) || IsBridgeAbove(tile + delta)) { | |||
There was a problem hiding this comment.
if (IsBridgeAbove(tile - delta)) {
int z_lower_bridge = GetBridgeHeight(GetNorthernBridgeEnd(tile - delta));
if (z_lower_bridge <= GetTileMaxZ(tile - delta) + 1) return_cmd_error(STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN);
}
|
This pull request has been automatically marked as stale because it has not had any activity in the last month. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WIP due to sprite ordering issues.