From 5547f47e841a2b8853f05c24abe39ce5d2de4b55 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Thu, 8 Aug 2024 13:12:07 -0700 Subject: [PATCH] fix merge error --- LEGO1/omni/src/video/mxsmack.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LEGO1/omni/src/video/mxsmack.cpp b/LEGO1/omni/src/video/mxsmack.cpp index 47714922..9621fb8c 100644 --- a/LEGO1/omni/src/video/mxsmack.cpp +++ b/LEGO1/omni/src/video/mxsmack.cpp @@ -55,6 +55,8 @@ MxResult MxSmack::LoadFrame( smk_next(p_mxSmack->m_smk); } + memcpy(p_bitmapData, smk_get_video(p_mxSmack->m_smk), w * h); + unsigned char frameType; smk_info_all(p_mxSmack->m_smk, NULL, NULL, &frameType, NULL); p_paletteChanged = frameType & 1;