From a49d60595dd9e562cee8a34de69e36c5defed42b Mon Sep 17 00:00:00 2001 From: Helloyunho Date: Sat, 5 Jul 2025 12:14:42 +0900 Subject: [PATCH] chore: match with upstream --- ISLE/isledebug.cpp | 4 ++++ LEGO1/lego/legoomni/src/race/carrace.cpp | 2 +- LEGO1/lego/legoomni/src/race/jetskirace.cpp | 4 +--- LEGO1/omni/src/stream/mxramstreamprovider.cpp | 4 +--- README.md | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ISLE/isledebug.cpp b/ISLE/isledebug.cpp index 8965b69a..70b03abc 100644 --- a/ISLE/isledebug.cpp +++ b/ISLE/isledebug.cpp @@ -183,7 +183,11 @@ void IsleDebug_Init() } g_videoPalette = SDL_CreateTexture(g_debugRenderer, SDL_PIXELFORMAT_RGBX32, SDL_TEXTUREACCESS_STREAMING, 16, 16); +#if SDL_VERSION_ATLEAST(3, 3, 0) && !defined(WINDOWS_STORE) + SDL_SetTextureScaleMode(g_videoPalette, SDL_SCALEMODE_PIXELART); +#else SDL_SetTextureScaleMode(g_videoPalette, SDL_SCALEMODE_NEAREST); +#endif if (!ImGui_ImplSDLRenderer3_Init(g_debugRenderer)) { g_debugEnabled = false; break; diff --git a/LEGO1/lego/legoomni/src/race/carrace.cpp b/LEGO1/lego/legoomni/src/race/carrace.cpp index b171dbde..d6320964 100644 --- a/LEGO1/lego/legoomni/src/race/carrace.cpp +++ b/LEGO1/lego/legoomni/src/race/carrace.cpp @@ -388,7 +388,7 @@ MxLong CarRace::HandleType0Notification(MxNotificationParam&) void CarRace::FUN_10017820(MxS32 p_param1, MxS16 p_param2) { MxS32 local4; - MxStillPresenter* presenter; + MxStillPresenter* presenter = NULL; MxS32 x, y; if (p_param1 == 11) { diff --git a/LEGO1/lego/legoomni/src/race/jetskirace.cpp b/LEGO1/lego/legoomni/src/race/jetskirace.cpp index 06580845..6ea02f86 100644 --- a/LEGO1/lego/legoomni/src/race/jetskirace.cpp +++ b/LEGO1/lego/legoomni/src/race/jetskirace.cpp @@ -24,8 +24,6 @@ #include -#pragma warning(disable : 4703) - // Defined in legopathstruct.cpp extern MxBool g_unk0x100f119c; @@ -265,7 +263,7 @@ MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param) void JetskiRace::FUN_10016930(MxS32 p_param1, MxS16 p_param2) { MxS32 local4; - MxStillPresenter* presenter; + MxStillPresenter* presenter = NULL; MxS32 x, y; if (p_param1 == 11) { diff --git a/LEGO1/omni/src/stream/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp index fdbe0ba1..966bec95 100644 --- a/LEGO1/omni/src/stream/mxramstreamprovider.cpp +++ b/LEGO1/omni/src/stream/mxramstreamprovider.cpp @@ -7,8 +7,6 @@ #include "mxstreamcontroller.h" #include "mxutilities.h" -#pragma warning(disable : 4703) - DECOMP_SIZE_ASSERT(MxStreamProvider, 0x10) DECOMP_SIZE_ASSERT(MxRAMStreamProvider, 0x24) @@ -110,7 +108,7 @@ MxU32 ReadData(MxU8* p_buffer, MxU32 p_size) { MxU32 id; MxU8* data = p_buffer; - MxU8* data2; + MxU8* data2 = NULL; while (data < p_buffer + p_size) { if (data + sizeof(MxU32) <= p_buffer + p_size && UnalignedRead(data) == FOURCC('M', 'x', 'O', 'b')) { diff --git a/README.md b/README.md index 7fa015cc..fe4a285f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# LEGO Island for Xbox One/Series X|S +# LEGO Island, portable [Development Vlog](https://www.youtube.com/playlist?list=PLbpl-gZkNl2Db4xcAsT_xOfOwRk-2DPHL) | [Contributing](/CONTRIBUTING.md) | [Matrix](https://matrix.to/#/#isledecomp:matrix.org) | [Forums](https://forum.mattkc.com/viewforum.php?f=1) | [Patreon](https://www.patreon.com/mattkc)