Fix #8956: Industry disaster news messages showed the wrong location #8992
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
LordAro
added
the
backport requested
TrueBrain
reviewed
Apr 10, 2021
src/disaster_vehicle.cpp
Outdated
| @@ -456,7 +456,7 @@ static bool DisasterTick_Aircraft(DisasterVehicle *v, uint16 image_override, boo | |||
| DestructIndustry(i); | |||
|
|
|||
| SetDParam(0, i->town->index); | |||
| AddTileNewsItem(news_message, NT_ACCIDENT, v->dest_tile); | |||
| AddIndustryNewsItem(news_message, NT_ACCIDENT, (IndustryID)v->dest_tile); | |||
There was a problem hiding this comment.
better use i->index ? As i->town->index is still valid, I assume so is i->index. But that is an assumption :D
There was a problem hiding this comment.
Owh, it used to be i->index. Seems we should just revert the change I made in dff7ee8 as the correct solution. I think it just got caught in my search for ->index, without realising this was the industry, instead of the vehicle.
There was a problem hiding this comment.
I thought about it, but figured it might be slightly cleaner to use the variable that we use to get the Industry object in the first place, a couple of lines further up ¯\_(ツ)_/¯
TrueBrain
approved these changes
Apr 10, 2021
LordAro
added a commit
to LordAro/OpenTTD
that referenced
this pull request
Apr 17, 2021
LordAro
added a commit
that referenced
this pull request
Apr 18, 2021
LordAro
added
backported
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.
Motivation / Problem
Industry disaster news messages showed the wrong location
Description
Caused by dff7ee8
Used dest_tile as the location, which was actually the Industry ID. Use the correct news message function instead
Limitations
Haven't actually been able to trigger the disaster to test it yet...
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.