isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 12:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into add-mortar-layer

Browse Source
This commit is contained in:
Christian Semmler 2026-01-31 09:55:33 -08:00 committed by GitHub
commit dad40c4989
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/miniaudio vendored

@ -1 +1 @@
Subproject commit 347321b27c58d42567e905c715de60ad43a6cb8e Subproject commit 13d161bc8d856ad61ae46b798bbeffc0f49808e8

6
ISLE/isleapp.cpp
View File

@ -938,6 +938,12 @@ MxResult IsleApp::SetupWindow()
#endif #endif
window = MORTAR_EX_CreateWindow(&createWindowProps); window = MORTAR_EX_CreateWindow(&createWindowProps);
#ifdef __EMSCRIPTEN__
// Force correct window size since SDL3 may have picked up CSS dimensions
MORTAR_SetWindowSize(window, g_targetWidth, g_targetHeight);
#endif
MORTAR_EXT_SetWindowProperty(window, MORTAR_WINDOW_PROPERTY_USER, &m_videoParam); MORTAR_EXT_SetWindowProperty(window, MORTAR_WINDOW_PROPERTY_USER, &m_videoParam);
if (m_exclusiveFullScreen && m_fullScreen) { if (m_exclusiveFullScreen && m_fullScreen) {

2
extensions/src/textureloader.cpp
View File

@ -64,6 +64,7 @@ bool TextureLoader::PatchTexture(LegoTextureInfo* p_textureInfo)
if (details->bits_per_pixel == 8) { if (details->bits_per_pixel == 8) {
MORTAR_Palette* sdlPalette = MORTAR_GetSurfacePalette(surface); MORTAR_Palette* sdlPalette = MORTAR_GetSurfacePalette(surface);
if (!sdlPalette) { if (!sdlPalette) {
p_textureInfo->m_surface->Unlock(desc.lpSurface);
MORTAR_DestroySurface(surface); MORTAR_DestroySurface(surface);
return false; return false;
} }
@ -78,6 +79,7 @@ bool TextureLoader::PatchTexture(LegoTextureInfo* p_textureInfo)
LPDIRECTDRAWPALETTE ddPalette = nullptr; LPDIRECTDRAWPALETTE ddPalette = nullptr;
if (pDirectDraw->CreatePalette(DDPCAPS_8BIT | DDPCAPS_ALLOW256, entries, &ddPalette, NULL) != DD_OK) { if (pDirectDraw->CreatePalette(DDPCAPS_8BIT | DDPCAPS_ALLOW256, entries, &ddPalette, NULL) != DD_OK) {
p_textureInfo->m_surface->Unlock(desc.lpSurface);
MORTAR_DestroySurface(surface); MORTAR_DestroySurface(surface);
return false; return false;
} }