Merge branch 'Saturn-Next' into Saturn-Testing

This commit is contained in:
Alug committed 2025-08-18 17:55:45 +02:00
commit 7ffb3ebdfe
2 files changed
+13 -13

No files matched your search

+9 -9
View File
@@ -1072,15 +1072,15 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
{
if ((pl->ffloor->flags & FF_CUTEXTRA) && (rover->flags & FF_EXTRA))
{
if (!(rover->flags & FF_EXTRA))
continue;
// The plane is from an extra 3D floor... Check the flags so
// there are no undesired cuts.
if (((pl->ffloor->flags & (FF_FOG|FF_SWIMMABLE)) == (rover->flags & (FF_FOG|FF_SWIMMABLE)))
&& pl->height < *rover->topheight
&& pl->height > *rover->bottomheight)
return;
if (pl->ffloor->flags & FF_EXTRA)
{
// The plane is from an extra 3D floor... Check the flags so
// there are no undesired cuts.
if (((pl->ffloor->flags & (FF_FOG|FF_SWIMMABLE)) == (rover->flags & (FF_FOG|FF_SWIMMABLE)))
&& pl->height < *rover->topheight
&& pl->height > *rover->bottomheight)
return;
}
}
}
+4 -4
View File
@@ -1483,12 +1483,12 @@ void I_FinishUpdate(void)
if (rendermode == render_soft && vid.screens[0])
{
SDL_LockSurface(vidSurface);
// copy pixels ourselves to the video surface (prevents a crash in libsdl)
UINT32 *dst = vidSurface->pixels;
UINT8 *src = vid.screens[0];
for (int32_t i = 0; i < vid.width * vid.height; i++)
UINT32 *restrict dst = vidSurface->pixels;
const UINT8 *restrict src = vid.screens[0];
const INT32 count = vid.width * vid.height;
for (INT32 i = 0; i < count; i++)
*dst++ = localPalette[*src++];
SDL_UnlockSurface(vidSurface);
// Fury -- there's no way around UpdateTexture, the GL backend uses it anyway