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 implicit fallthroughs #8550

Merged
merged 2 commits into from Jan 4, 2019
Merged

Fix implicit fallthroughs #8550

merged 2 commits into from Jan 4, 2019

Conversation

@janisozaur
Copy link
Member

janisozaur commented Jan 2, 2019

No description provided.

@janisozaur janisozaur requested a review from IntelOrca Jan 2, 2019
@Broxzier Broxzier self-requested a review Jan 3, 2019
@@ -30,7 +30,7 @@
// This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "18"
#define NETWORK_STREAM_VERSION "19"

This comment has been minimized.

Copy link
@ZehMatt

ZehMatt Jan 4, 2019

Contributor

Does this really need a new network version? I don't see any logic changes.

{
return language_get_string(STR_CHEAT_CLEAR_GRASS);
}
return language_get_string(STR_CHEAT_CLEAR_GRASS);

This comment has been minimized.

Copy link
@janisozaur

janisozaur Jan 4, 2019

Author Member

Logic change here

This comment has been minimized.

Copy link
@ZehMatt

ZehMatt Jan 4, 2019

Contributor

Is edx ever anything other than 0 and 1?

This comment has been minimized.

Copy link
@janisozaur

janisozaur Jan 4, 2019

Author Member

Likely not, but we can just guard from other values here just in case

}
break;

This comment has been minimized.

Copy link
@Broxzier

Broxzier Jan 4, 2019

Member

And here as well.

@janisozaur

This comment has been minimized.

Copy link
Member Author

janisozaur commented Jan 4, 2019

Looks like it's ready now?

@Broxzier Broxzier merged commit 53ae48f into OpenRCT2:develop Jan 4, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
janisozaur added a commit to janisozaur/OpenRCT2 that referenced this pull request Nov 8, 2019
…ed vertical coaster (OpenRCT2#8635)

In OpenRCT2#10204 it was found that
the issue the reverted commit tried to fix was likely a regression from
OpenRCT2#8550
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.