diff --git a/ISLE/stb_image.h b/ISLE/stb_image.h index 9eedabed..1c4b427f 100644 --- a/ISLE/stb_image.h +++ b/ISLE/stb_image.h @@ -1,3 +1,4 @@ +// clang-format off /* stb_image - v2.30 - public domain image loader - http://nothings.org/stb no warranty implied; use at your own risk diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp index 0d048538..dc0f33f9 100644 --- a/LEGO1/omni/src/video/mxdisplaysurface.cpp +++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp @@ -10,6 +10,7 @@ #include #include +#include #ifdef MINIWIN #include "miniwin/windows.h" #else @@ -1143,7 +1144,7 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface( else { MxU32* surface = (MxU32*) ddsd.lpSurface; - std::memcpy(surface, p_cursorBitmap, p_x * p_y * sizeof(MxU32)); + memcpy(surface, p_cursorBitmap, p_x * p_y * sizeof(MxU32)); newSurface->Unlock(ddsd.lpSurface);