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 #8584: Duck spawn search now uses entire map #9743

Merged
merged 5 commits into from Oct 2, 2019

Conversation

ZehMatt
Copy link
Member

@ZehMatt ZehMatt commented Aug 6, 2019

This one should be without crashes. I left a few asserts in there to be sure and they have no performance impact.

Copy link
Contributor

@duncanspumpkin duncanspumpkin left a comment

Choose a reason for hiding this comment

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

Would prefer if we are touching this to refactor to use CoordsXY where we can.

@IntelOrca
Copy link
Contributor

If this gets rebased and changed to use coords which might be easier now after @duncanspumpkin's refactor, we can merge.

@ZehMatt
Copy link
Member Author

ZehMatt commented Aug 24, 2019

Sorry got a little distracted by other things, will do this today.

@ZehMatt
Copy link
Member Author

ZehMatt commented Aug 24, 2019

Applied the requested changes and cleaned up the code a little bit. Also I bumped up the network version since scenario_rand is now called twice.

@ZehMatt ZehMatt added changelog This issue/PR deserves a changelog entry. network version Network version needs updating - double check before merging! labels Aug 24, 2019
@Gymnasiast
Copy link
Member

Could you rebase this and rebump the network version? I think it's time to get this merged, and Duncan's requested changes have been made anyway.

@ZehMatt ZehMatt force-pushed the fix-8584 branch 3 times, most recently from e7c7dce to 03ecfb7 Compare October 2, 2019 15:41
@ZehMatt
Copy link
Member Author

ZehMatt commented Oct 2, 2019

Rebased and incremented the network version

@Gymnasiast Gymnasiast dismissed duncanspumpkin’s stale review October 2, 2019 20:14

Requested changes have been made

@Gymnasiast Gymnasiast merged commit 0b95dcd into OpenRCT2:develop Oct 2, 2019
@ZehMatt ZehMatt deleted the fix-8584 branch October 2, 2019 21:34
XplosiveLugnut pushed a commit to XplosiveLugnut/OpenRCT2 that referenced this pull request Apr 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog This issue/PR deserves a changelog entry. network version Network version needs updating - double check before merging!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants