forked from Return-To-The-Roots/s25client
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge for wine addon #1
Merged
Merged
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
Translate comments and improve naming and comments
Only used in one place and includes costly PointQuality calculation which needs to happen twice due to this.
Easier handling for derived classes that need to check for available wares.
Translate comments and use `static_vector` instead of array and size
The startDirection was added to a valid direction which may result in an invalid direction. Use a random index instead.
Skip loop iteration if there are no people of a job. This also avoids asyncs when adding/removing jobs and improves speed by not calling RANDOM_RAND in that case.
This reverts commit b30e4ec.
We only provide backwards compatibility. So we need to reject any newer version to avoid corrupting memory due to unexpected changes.
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.
I prepared this for Return-To-The-Roots#1673
This should make the PR ready for merge. Old replays unfortunately won't work as I identified an async caused by the added jobs which cannot be helped. I added some changes to avoid such issues in the future.
Turns out the recently merged PR to avoid roads at the border is already enough to make old replays go async. Hence no reason to hold that back for that anymore.
I also improved the farmhand handling a bit to make especially the
GetPointQuality
clearer.The bulk though is the merge of master and update of replays (you can reduce the diff by merging yourself if you want to have a look at that).
Return-To-The-Roots#1677 does help to be able to load old replays though. I tested that on top of your PR which then showed the async due to the warehouse issue.