isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-21 07:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix stride/length check in vtable24 and vtable28

Browse Source
This commit is contained in:
disinvite 2024-12-22 22:15:26 -05:00
parent f301b6b189
commit 2dfbc763b5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
LEGO1/omni/src/video/mxdisplaysurface.cpp
View File

@ -398,7 +398,7 @@ void MxDisplaySurface::VTable0x28(
MxU16* p16bitPal = m_16bitPal; MxU16* p16bitPal = m_16bitPal;
MxS32 i; MxS32 i;
if (stride || length) { if (!stride && !length) {
while (height--) { while (height--) {
MxU8* surfaceBefore = surface; MxU8* surfaceBefore = surface;
@ -1131,8 +1131,7 @@ void MxDisplaySurface::VTable0x24(
MxU16* p16bitPal = m_16bitPal; MxU16* p16bitPal = m_16bitPal;
MxS32 i; MxS32 i;
// DECOMP: branches swapped from VTable0x28 if (!stride && !length) {
if (stride || length) {
while (height--) { while (height--) {
MxU8* surfaceBefore = surface; MxU8* surfaceBefore = surface;
@ -1146,10 +1145,7 @@ void MxDisplaySurface::VTable0x24(
surface += 2; surface += 2;
} }
data += stride; memcpy(surface, surfaceBefore, copyWidth);
surface += length;
memcpy(surface, surfaceBefore, p_width * 4);
surface += p_desc->lPitch; surface += p_desc->lPitch;
} }
} }
@ -1167,7 +1163,10 @@ void MxDisplaySurface::VTable0x24(
surface += 2; surface += 2;
} }
memcpy(surface, surfaceBefore, copyWidth); data += stride;
surface += length;
memcpy(surface, surfaceBefore, p_width * 4);
surface += p_desc->lPitch; surface += p_desc->lPitch;
} }
} }