Vehicle Functions: Update daily #2182
Open
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
duncanspumpkin
force-pushed
the
updateDaily
branch
2 times, most recently
from
184202f
to
a7859fc
Compare
|
What's still needed for this PR? |
LeftofZen
reviewed
Apr 6, 2024
LeftofZen
reviewed
Apr 6, 2024
LeftofZen
reviewed
Apr 6, 2024
| void removeEntityFromThought(AiThought& thought, EntityId id) | ||
| { | ||
| auto iter = std::find(std::begin(thought.var_66), std::end(thought.var_66), id); | ||
| if (iter == std::end(thought.var_66)) |
LeftofZen
reviewed
Apr 6, 2024
| // Original would copy the value from var_66 + 2 which | ||
| // would mean it would copy currency var_76 if var_44 was 7 | ||
| // I don't think that is possible but lets just add an assert. | ||
| assert(thought.var_44 < 7); |
There was a problem hiding this comment.
similarly can we name var_44?
LeftofZen
reviewed
Apr 6, 2024
LeftofZen
reviewed
Apr 6, 2024
| crashedTimeout = Math::Bound::add(crashedTimeout, 1U); | ||
| if (!CompanyManager::isPlayerCompany(owner)) | ||
| { | ||
| if (crashedTimeout > 14 && var_60 != 0xFF) |
There was a problem hiding this comment.
can we add a constant for the 14, and can we rename var_60?
LeftofZen
reviewed
Apr 6, 2024
LeftofZen
requested changes
Apr 6, 2024
duncanspumpkin
force-pushed
the
updateDaily
branch
from
a7859fc
to
f8b6f7f
Compare
|
There is some sort of divergence in this. I've narrowed it down to the loop at L312 or the minReliabilityCount but i can't tell what ive done wrong. I didn't implement it exactly as per the assembly as it looked like there were some easy simplifications. |
duncanspumpkin
force-pushed
the
updateDaily
branch
from
13896fe
to
d0fd9e6
Compare
duncanspumpkin
commented
May 13, 2024
| @@ -312,7 +312,7 @@ namespace OpenLoco::Vehicles | |||
| reliabilityFactor /= 16; | |||
|
|
|||
| auto& prng = gPrng1(); | |||
| int32_t randVal = (prng.randNext(65535) * reliabilityFactor / 2) / 65536; | |||
| int32_t randVal = (prng.randNext(65535) * (reliabilityFactor / 2)) / 65536; | |||
There was a problem hiding this comment.
this fix causes replays to diverge as its used by create vehicle as well but i checked and it is how it is meant to work so will record new masters.
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.
There is some horrible branches in this code. I can't see an easy way to rework it to not be as horrible whilst still matching vanilla logic.