Merge branch 'master' into emscripten

This commit is contained in:
Christian Semmler 2025-06-04 17:21:04 -07:00
commit 63bfaa6b35
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
2 changed files with 2 additions and 3 deletions

View File

@ -741,14 +741,13 @@ void WriteDefaultTexture(LegoStorage* p_storage, const char* p_name)
paletteEntries[i].SetBlue(entries[i].peBlue);
}
SDL_Palette* newPalette = SDL_CreatePalette(i);
image->SetPalette(SDL_CreatePalette(i));
if (i > 0) {
for (MxS32 j = 0; j < i; j++) {
image->SetPaletteEntry(j, paletteEntries[j]);
}
}
image->SetPalette(newPalette);
LegoTexture texture;
texture.SetImage(image);

View File

@ -162,7 +162,7 @@ LegoResult LegoImage::Write(LegoStorage* p_storage)
if ((result = p_storage->Write(&m_surface->h, sizeof(int))) != SUCCESS) {
return result;
}
if ((result = p_storage->Write(&m_surface->h, sizeof(int))) != SUCCESS) {
if ((result = p_storage->Write(&m_palette->ncolors, sizeof(int))) != SUCCESS) {
return result;
}
if (m_palette) {