Merge branch 'Saturn-Next' into retrySOCK

This commit is contained in:
alufolie91 committed 2026-07-21 16:11:43 +02:00
commit 229a6a161e
12 files changed
+475 -368

No files matched your search

+15 -15
View File
@@ -776,15 +776,15 @@ static int GLFramebuffer_CheckExt(void)
// gl versions from 2.1 may still support framebuffer objects
// maybe, just maybe, we support the standart extensions
if (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions)
&& GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions)
&& GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions))
if (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) &&
GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) &&
GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions))
return FBO_ARB;
// nope, try the older 2.1 extensions
if (GL_isExtAvailable("GL_EXT_framebuffer_no_attachments", gl_extensions)
&& GL_isExtAvailable("GL_EXT_framebuffer_object", gl_extensions)
&& GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions))
if (GL_isExtAvailable("GL_EXT_framebuffer_no_attachments", gl_extensions) &&
GL_isExtAvailable("GL_EXT_framebuffer_object", gl_extensions) &&
GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions))
{
// perhaps we may even support a stencil attachment
if (GL_isExtAvailable("GL_EXT_packed_depth_stencil", gl_extensions))
@@ -885,7 +885,7 @@ void SetupGLFunc4(void)
{ \
GL_MSG_Warning("failed to get OpenGL FBO function: %s\n", #func); \
GL_DBG_Printf("\nFBO: No framebuffer object support\n"); \
supportFBO = false; \
supportFBO = FBO_NONE; \
return; \
} \
@@ -3247,7 +3247,7 @@ void GL_SetTransform(FTransform *stransform)
#ifdef USE_FBO_OGL
static void GL_Framebuffer_DeleteAttachments(void)
{
if (!supportFBO || !framebufferobject.init)
if (supportFBO == FBO_NONE || !framebufferobject.init)
return;
// Unbind the framebuffer
@@ -3267,7 +3267,7 @@ static void GL_Framebuffer_DeleteAttachments(void)
static void GL_Framebuffer_Generate(void)
{
if (!supportFBO || framebufferobject.init || !UseScreenFBO())
if (supportFBO == FBO_NONE || framebufferobject.init || !UseScreenFBO())
return;
// Generate the framebuffer
@@ -3287,10 +3287,10 @@ static void GL_Framebuffer_Generate(void)
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
Clamp2D(GL_TEXTURE_WRAP_S);
Clamp2D(GL_TEXTURE_WRAP_T);
pglBindTexture(GL_TEXTURE_2D, 0);
// Attach the framebuffer texture to the framebuffer
pglFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, framebufferobject.tex, 0);
pglBindTexture(GL_TEXTURE_2D, 0);
}
// Generate the renderbuffer
@@ -3332,7 +3332,7 @@ static void GL_Framebuffer_Generate(void)
// if this fails, dont retry it a gazillion times
// this wouldnt recover
supportFBO = false;
supportFBO = FBO_NONE;
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
return;
}
@@ -3345,7 +3345,7 @@ static void GL_Framebuffer_Generate(void)
void GL_Framebuffer_Unbind(void)
{
if (!supportFBO || !framebufferobject.init)
if (supportFBO == FBO_NONE || !framebufferobject.init)
return;
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
@@ -3354,13 +3354,13 @@ void GL_Framebuffer_Unbind(void)
void GL_Framebuffer_Enable(void)
{
if (!supportFBO || !UseScreenFBO())
if (supportFBO == FBO_NONE || !UseScreenFBO())
return;
GL_Framebuffer_Generate();
// failed
if (!supportFBO || !framebufferobject.init)
if (supportFBO == FBO_NONE || !framebufferobject.init)
return;
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
@@ -3369,7 +3369,7 @@ void GL_Framebuffer_Enable(void)
void GL_Framebuffer_Disable(void)
{
if (!supportFBO || !framebufferobject.init)
if (supportFBO == FBO_NONE || !framebufferobject.init)
return;
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
+4 -3
View File
@@ -2259,12 +2259,13 @@ static void HU_DrawSongCreditsBox(void)
y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup - interpoffset)/FRACUNIT;
}
bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2);
bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2) - 2; // arbitrary value, looks a bit better
if (bgt < NUMTRANSMAPS)
{
V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, 28|flags|(bgt<<V_ALPHASHIFT));
V_DrawFill(x+dup, y+dup, (strwidth-2)*dup, (BOXCREDITHEIGHT-2)*dup, 30|flags|(bgt<<V_ALPHASHIFT));
const UINT8 accent = colortranslations[K_GetHudColor()][7];
V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, accent|flags|(bgt<<V_ALPHASHIFT));
V_DrawFill(x+dup, y+dup, (strwidth-2)*dup, (BOXCREDITHEIGHT-2)*dup, accent|flags|(bgt<<V_ALPHASHIFT));
}
if (cursongcredit.trans < NUMTRANSMAPS)
+2
View File
@@ -3087,6 +3087,8 @@ static int lib_gPlayerDeviceRumble(lua_State *L)
if (!player)
return LUA_ErrInvalid(L, "player_t");
if (demo.playback) return 0;
pnum = P_GetLocalPlayerNumForPlayer(player);
// Not a local player
+6 -6
View File
@@ -9048,15 +9048,15 @@ static boolean M_QuitMultiPlayerMenu(void)
if (!fastcmp(setupm_name, setupm_cvname->string))
{
// remove trailing whitespaces
for (l = strlen(setupm_name)-1;
(signed)l >= 0 && setupm_name[l] ==' '; l--)
setupm_name[l] =0;
COM_BufAddText(va("%s \"%s\"\n",setupm_cvname->name,setupm_name));
l = strlen(setupm_name)-1;
for (;(signed)l >= 0 && setupm_name[l] ==' '; l--)
setupm_name[l] = 0;
COM_BufAddText(va("%s \"%s\"\n", setupm_cvname->name, setupm_name));
}
// you know what? always putting these in the buffer won't hurt anything.
COM_BufAddText(va("%s \"%s\"\n",setupm_cvskin->name,skins[setupm_fakeskin].name));
COM_BufAddText(va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor));
COM_BufAddText(va("%s \"%s\"\n", setupm_cvskin->name, skins[setupm_fakeskin].name));
COM_BufAddText(va("%s %d\n", setupm_cvcolor->name, setupm_fakecolor));
return true;
}
+2 -8
View File
@@ -10879,10 +10879,7 @@ void A_BrakLobShot(void *thing)
return; // Don't even bother if we've got nothing to aim at.
// Look up actor's current gravity situation
if (actor->subsector->sector->gravity)
g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000)));
else
g = gravity;
g = P_GetSectorGravity(actor->subsector->sector);
// Look up distance between actor and its target
x = P_AproxDistance(actor->target->x - actor->x, actor->target->y - actor->y);
@@ -10997,10 +10994,7 @@ void A_NapalmScatter(void *thing)
airtime = 16<<FRACBITS;
// Look up actor's current gravity situation
if (actor->subsector->sector->gravity)
g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000)));
else
g = gravity;
g = P_GetSectorGravity(actor->subsector->sector);
// vy = (g*(airtime-1))/2
vy = FixedMul(g,(airtime-(1<<FRACBITS)))>>1;
+6 -7
View File
@@ -1828,14 +1828,14 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
delta1 = abs(thing->z - midheight);
delta2 = abs(thingtop - midheight);
if (topheight > tmfloorz && delta1 < delta2
if ((topheight > tmfloorz) && (delta1 < delta2)
&& !(rover->flags & FF_REVERSEPLATFORM))
{
tmfloorz = tmdropoffz = topheight;
tmfloorslope = *rover->t_slope;
}
if (bottomheight < tmceilingz && delta1 >= delta2
if ((bottomheight < tmceilingz) && (delta1 >= delta2)
&& !(rover->flags & FF_PLATFORM)
&& !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE)))
{
@@ -1890,8 +1890,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
po->validcount = validcount;
if (!P_BBoxInsidePolyobj(po, tmbbox)
|| !(po->flags & POF_SOLID))
if (!(po->flags & POF_SOLID) || !P_BBoxInsidePolyobj(po, tmbbox))
{
plink = (polymaplink_t *)(plink->link.next);
continue;
@@ -2136,7 +2135,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
po->validcount = validcount;
if (!P_PointInsidePolyobj(po, x, y) || !(po->flags & POF_SOLID))
if (!(po->flags & POF_SOLID) || !P_PointInsidePolyobj(po, x, y))
{
plink = (polymaplink_t *)(plink->link.next);
continue;
@@ -3767,7 +3766,7 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
delta1 = abs(thing->z - midheight);
delta2 = abs(thingtop - midheight);
if (bottomheight <= thing->ceilingz && delta1 >= delta2)
if ((bottomheight <= thing->ceilingz) && (delta1 >= delta2))
{
if (thing->flags & MF_PUSHABLE)
{
@@ -4277,7 +4276,7 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
delta1 = abs(z - midheight);
delta2 = abs(thingtop - midheight);
if (topheight > floorz && delta1 < delta2)
if ((topheight > floorz) && (delta1 < delta2))
floorz = topheight;
}
}
+28 -14
View File
@@ -326,7 +326,7 @@ void P_CameraLineOpening(line_t *linedef)
{
for (rover = front->ffloors; rover; rover = rover->next)
{
fixed_t topheight, bottomheight;
fixed_t topheight, bottomheight, midheight;
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
continue;
@@ -334,8 +334,10 @@ void P_CameraLineOpening(line_t *linedef)
topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
bottomheight = P_CameraGetFOFBottomZ(mapcampointer, front, rover, tmx, tmy, linedef);
delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2)));
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
midheight = (bottomheight + ((topheight - bottomheight) / 2));
delta1 = abs(mapcampointer->z - midheight);
delta2 = abs(thingtop - midheight);
if (bottomheight < lowestceiling && delta1 >= delta2)
lowestceiling = bottomheight;
@@ -354,7 +356,7 @@ void P_CameraLineOpening(line_t *linedef)
{
for (rover = back->ffloors; rover; rover = rover->next)
{
fixed_t topheight, bottomheight;
fixed_t topheight, bottomheight, midheight;
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
continue;
@@ -362,8 +364,10 @@ void P_CameraLineOpening(line_t *linedef)
topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);
bottomheight = P_CameraGetFOFBottomZ(mapcampointer, back, rover, tmx, tmy, linedef);
delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2)));
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
midheight = (bottomheight + ((topheight - bottomheight) / 2));
delta1 = abs(mapcampointer->z - midheight);
delta2 = abs(thingtop - midheight);
if (bottomheight < lowestceiling && delta1 >= delta2)
lowestceiling = bottomheight;
@@ -524,7 +528,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
// Check for frontsector's fake floors
for (rover = front->ffloors; rover; rover = rover->next)
{
fixed_t topheight, bottomheight;
fixed_t topheight, bottomheight, midheight;
if (!(rover->flags & FF_EXISTS))
continue;
@@ -538,8 +542,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
topheight = P_GetFOFTopZ(mobj, front, rover, tmx, tmy, linedef);
bottomheight = P_GetFOFBottomZ(mobj, front, rover, tmx, tmy, linedef);
delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
midheight = (bottomheight + ((topheight - bottomheight) / 2));
delta1 = abs(mobj->z - midheight);
delta2 = abs(thingtop - midheight);
if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
{
@@ -567,7 +573,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
// Check for backsectors fake floors
for (rover = back->ffloors; rover; rover = rover->next)
{
fixed_t topheight, bottomheight;
fixed_t topheight, bottomheight, midheight;
if (!(rover->flags & FF_EXISTS))
continue;
@@ -580,8 +586,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
topheight = P_GetFOFTopZ(mobj, back, rover, tmx, tmy, linedef);
bottomheight = P_GetFOFBottomZ(mobj, back, rover, tmx, tmy, linedef);
delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
midheight = (bottomheight + ((topheight - bottomheight) / 2));
delta1 = abs(mobj->z - midheight);
delta2 = abs(thingtop - midheight);
if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
{
@@ -611,8 +619,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
{
const sector_t *polysec = linedef->backsector;
delta1 = abs(mobj->z - (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight)/2)));
delta2 = abs(thingtop - (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight)/2)));
const fixed_t polymid = (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight) / 2));
delta1 = abs(mobj->z - polymid);
delta2 = abs(thingtop - polymid);
if (polysec->floorheight < lowestceiling && delta1 >= delta2)
{
@@ -620,7 +630,9 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
ceilingslope = NULL;
}
else if (polysec->floorheight < highestceiling && delta1 >= delta2)
{
highestceiling = polysec->floorheight;
}
if (polysec->ceilingheight > highestfloor && delta1 < delta2)
{
@@ -628,7 +640,9 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
floorslope = NULL;
}
else if (polysec->ceilingheight > lowestfloor && delta1 < delta2)
{
lowestfloor = polysec->ceilingheight;
}
}
if (highestceiling < highceiling)
+386 -306
View File
File diff suppressed because it is too large. Load diff
+12
View File
@@ -5302,6 +5302,18 @@ static void P_RunLevelLoadExecutors(void)
}
}
static fixed_t P_GetSectorGravityFactor(sector_t *sec)
{
return FixedDiv(*sec->gravity >> FRACBITS, 1000);
}
fixed_t P_GetSectorGravity(sector_t *sec)
{
if (sec && sec->gravity)
return FixedMul(gravity, P_GetSectorGravityFactor(sec));
return gravity;
}
/** After the map has loaded, scans for specials that spawn 3Dfloors and
* thinkers.
*
+2
View File
@@ -56,6 +56,8 @@ sector_t *P_PlayerTouchingSectorSpecial(player_t *player, INT32 section, INT32 n
void P_PlayerInSpecialSector(player_t *player);
void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *roversector);
fixed_t P_GetSectorGravity(sector_t *sec);
fixed_t P_FindLowestFloorSurrounding(sector_t *sec);
fixed_t P_FindHighestFloorSurrounding(sector_t *sec);
+12 -8
View File
@@ -1352,13 +1352,18 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
textline = value;
// turn _ into spaces.
#define ADDDEF(field)\
int err = 0;\
STRBUFCPY(def->field, textline);\
for (textline = def->field; *textline; textline++) {\
if (err == 0 && *textline == ' ') {err = 1; CONS_Alert(CONS_WARNING, "MUSICDEF: Erroneous whitespace detected in field '%s': '%s'.\n(file %s, line %d) Musicdef might not work correctly!\n", stoken, def->field, wadfiles[wadnum]->filename, line);}\
if (*textline == '_') *textline = ' ';\
// turn _ into spaces while also removing trailing whitespaces.
#define ADDDEF(field) \
int err = 0; \
STRBUFCPY(def->field, textline); \
size_t len = strlen(def->field); \
while (len > 0 && (def->field[len-1] == ' ')) { \
def->field[len-1] = 0; \
len--; \
} \
for (textline = def->field; *textline; textline++) { \
if (err == 0 && *textline == ' ') {err = 1; CONS_Alert(CONS_WARNING, "MUSICDEF: Erroneous whitespace detected in field '%s': '%s'.\n(file %s, line %d) Musicdef might not work correctly!\n", stoken, value, wadfiles[wadnum]->filename, line);} \
if (*textline == '_') *textline = ' '; \
}
if (fasticmp(stoken, "usage"))
@@ -1371,7 +1376,6 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
}
else if (fasticmp(stoken, "title"))
{
def->use_info = true;
ADDDEF(title);
}
else if (fasticmp(stoken, "alttitle"))
-1
View File
@@ -186,7 +186,6 @@ typedef struct musicdef_s
char title[256];
char alttitle[256];
char authors[256];
boolean use_info;
size_t num;
} musicdef_t;