Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit #9415
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
rubidium42
reviewed
Jul 6, 2021
There was a problem hiding this comment.
I haven't found any documentation mentioning saving 32 bits values, so it's safe on that front. However, the links (2) in the documentation of ScriptController to the AI:Save/Load page on the wiki are broken. I guess they should now be https://wiki.openttd.org/en/Development/Script/Save%20and%20Load. That page does not seem to mention the values being 32 bits either, so it doesn't need to be updated.
| @@ -364,8 +364,8 @@ static const SaveLoad _script_byte[] = { | |||
| SQInteger res; | |||
| sq_getinteger(vm, index, &res); | |||
| if (!test) { | |||
| int value = (int)res; | |||
| SlCopy(&value, 1, SLE_INT32); | |||
| int64 value = (int64)res; | |||
There was a problem hiding this comment.
I think the cast should not be needed as SQInteger is already defined at __int64. Explicitly having a separate variable of the right type is definitely a good thing.
rubidium42
approved these changes
Jul 6, 2021
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
In 39e90ec, integer for scripts was made 64bits always.
But before this change they were always saved as 32bits, mainly for compatibility.
Description
Now they are saved as 64bit. A savegame bump is of course required.
Limitations
May need some documentation fixes and updates too.
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.