Skip to content

Draw overlay images with an offset. - #1968

Merged
Flamefire merged 4 commits into
Return-To-The-Roots:masterfrom
Lknadfodr:issue-1966
Aug 10, 2026
Merged

Flamefire merged 4 commits into
Return-To-The-Roots:masterfrom
Lknadfodr:issue-1966

Conversation

@Lknadfodr

@Lknadfodr Lknadfodr commented Aug 6, 2026 •

Copy link
Copy Markdown

@Lknadfodr
Lknadfodr marked this pull request as ready for review August 9, 2026 20:03
Comment thread libs/s25main/ogl/glBitmapItem.cpp Outdated
Comment thread libs/s25main/ogl/glArchivItem_Bob.cpp Outdated
@Flamefire
Flamefire enabled auto-merge August 10, 2026 13:59
@Flamefire
Flamefire merged commit 5e064ee into Return-To-The-Roots:master Aug 10, 2026
20 of 21 checks passed
Flamefire added a commit to Flamefire/s25client that referenced this pull request Sep 24, 2026
In `glArchivItem_Bob::mergeLinks` the ny-offset array for additional Bobs was not resized leading to an OOB access when accessing the sprites
after Return-To-The-Roots#1968
Fix by using a single array instead.

Fixes Return-To-The-Roots#1982
Fixes Return-To-The-Roots#1983
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] Incorrect Y offsets for some figure sprites

2 participants