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

Fix #8221: Subtitle - No Bridge Type Given Size #8240

Merged
merged 2 commits into from Jun 28, 2020
Merged

Fix #8221: Subtitle - No Bridge Type Given Size #8240

merged 2 commits into from Jun 28, 2020

Conversation

TrevorShelton
Copy link
Contributor

@TrevorShelton TrevorShelton commented Jun 27, 2020

The error box for going over max the lengths for each of the bridge types was given the "...bridge too long" subtitle.

The error box for going over max the lengths for each of the bridge type was given the "...bridge too long" subtitle.
@TrevorShelton TrevorShelton changed the title Fix #8221: No Bridge Type Given Size, Subtitle Fix #8221: Subtitle For No Bridge Type Given Size Jun 27, 2020
@TrevorShelton TrevorShelton changed the title Fix #8221: Subtitle For No Bridge Type Given Size Fix #8221: Subtitle - No Bridge Type Given Size Jun 27, 2020
Copy link
Contributor

@glx22 glx22 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a quick read, didn't check the actual change.

@@ -426,9 +426,12 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo
default: break;
}

bool any_available = 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
bool any_available = 0;
bool any_available = false;

@@ -437,8 +440,14 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo
/* Add to terraforming & bulldozing costs the cost of the
* bridge itself (not computed with DC_QUERY_COST) */
item.cost = ret.GetCost() + (((int64)tot_bridgedata_len * _price[PR_BUILD_BRIDGE] * item.spec->price) >> 8) + infra_cost;
any_available = 1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
any_available = 1;
any_available = true;

@LordAro LordAro merged commit a4a9908 into OpenTTD:master Jun 28, 2020
@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label Jul 27, 2020
@glx22 glx22 added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Nov 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants