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

fix merge error

Browse Source
This commit is contained in:
Christian Semmler 2024-08-08 13:12:07 -07:00
parent 03781da2ed
commit 5547f47e84
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/omni/src/video/mxsmack.cpp
View File

@ -55,6 +55,8 @@ MxResult MxSmack::LoadFrame(
smk_next(p_mxSmack->m_smk); smk_next(p_mxSmack->m_smk);
} }
memcpy(p_bitmapData, smk_get_video(p_mxSmack->m_smk), w * h);
unsigned char frameType; unsigned char frameType;
smk_info_all(p_mxSmack->m_smk, NULL, NULL, &frameType, NULL); smk_info_all(p_mxSmack->m_smk, NULL, NULL, &frameType, NULL);
p_paletteChanged = frameType & 1; p_paletteChanged = frameType & 1;