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

SCUMM: Fix bad offset on game loading #2787

Merged
merged 1 commit into from Feb 19, 2021
Merged

SCUMM: Fix bad offset on game loading #2787

merged 1 commit into from Feb 19, 2021

Conversation

@orgads
Copy link
Contributor

@orgads orgads commented Feb 19, 2021

The iterator l was used inside the loop, which caused it to bail out
after 12 iterations instead of 16.

Amends 434d1f3.

The iterator l was used inside the loop, which caused it to bail out
after 12 iterations instead of 16.

Amends 434d1f3.
@orgads
Copy link
Contributor Author

@orgads orgads commented Feb 19, 2021

@AndywinXp
Copy link
Contributor

@AndywinXp AndywinXp commented Feb 19, 2021

Thanks! Luckily the bug didn't affect much the outcome since 0-7 index are the ones which are effectively used (unless some edge cases happen), but if not fixed, this bug would have created some headscratching problems in the long way; kudos for finding it! I'll update my FT pull request with this fix, as soon as this gets merged

@orgads
Copy link
Contributor Author

@orgads orgads commented Feb 19, 2021

It actually did cause a strange problem. _verbLineSpacing got 0 on load, and dialogs with multiple lines had the second line overwrite the first one in COMI (at least on Hebrew).

@AndywinXp
Copy link
Contributor

@AndywinXp AndywinXp commented Feb 19, 2021

It actually did cause a strange problem. _verbLineSpacing got 0 on load, and dialogs with multiple lines had the second line overwrite the first one in COMI (at least on Hebrew).

Uh, that's odd, it didn't happen in both english and italian versions (which are the only copies I own), but I'm glad you found the issue, it could have potentially broken other versions too, thanks again!

@bluegr
Copy link
Member

@bluegr bluegr commented Feb 19, 2021

Nice catch, thanks! Merging

@bluegr bluegr merged commit c0461b7 into scummvm:master Feb 19, 2021
3 checks passed
3 checks passed
Codacy Static Code Analysis Codacy Static Code Analysis
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deepcode-ci-bot Well done, no issues found!
Details
@orgads
Copy link
Contributor Author

@orgads orgads commented Feb 24, 2021

@AndywinXp Can you please have a look at https://bugs.scummvm.org/ticket/12188?

@AndywinXp
Copy link
Contributor

@AndywinXp AndywinXp commented Feb 24, 2021

Sure, but let's move this discussion to discord

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants