From 68cb96ab979dc5961c3b4d3cfdba726e3438d7e1 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 15 Jul 2025 13:59:17 +0200 Subject: [PATCH 01/80] :skull: fix menu screentex toggle lel thx neppy! --- src/m_menu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/m_menu.c b/src/m_menu.c index 2fb38a4d5..ce69b1eca 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1521,6 +1521,7 @@ enum //op_exp_dirlight, op_exp_skybox, op_exp_accuratefps, + op_exp_votescrn, #ifdef HWRENDER op_exp_glscrtx, #ifdef USE_FBO_OGL From fdd19632bfda63b0290271303698f7ce4ccb6fe4 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 21 Jul 2025 18:32:37 +0200 Subject: [PATCH 02/80] Use R_RenderSegLoop if the back sector has any 3D floor planes fixes issues in northern district zone --- src/r_segs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/r_segs.cpp b/src/r_segs.cpp index 6bc139a2d..02159d40d 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -2888,7 +2888,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) didsolidcol = false; - if (!segtextured && !numffloors) + if (!segtextured && !numffloors && !numbackffloors) { if (markfloor || markceiling) R_MarkSegBounds(); From f3c8ff19b987cf3c4bef9b93435269cad7d33c92 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 21 Jul 2025 19:10:47 +0200 Subject: [PATCH 03/80] remove redundant R_SetColumnFunc call this would only be needed if we had brightmap support, but like this it just sets the column function to what it already is --- src/r_segs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/r_segs.cpp b/src/r_segs.cpp index 02159d40d..848483c97 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -1166,7 +1166,7 @@ static void R_DrawWallColumn(drawcolumndata_t* dc, INT32 yl, INT32 yh, fixed_t m dc->source = R_GetColumn(texture, texturecolumn); dc->texheight = textureheight[texture] >> FRACBITS; dc->sourcelength = dc->texheight; - R_SetColumnFunc(colfunctype); + //R_SetColumnFunc(colfunctype); coldrawfunc_t* colfunccopy = colfunc; drawcolumndata_t dc_copy = *dc; if (remap) From 1e879dc4325344fe9a454df14ad7b93cc14dbb6a Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 17:58:25 +0200 Subject: [PATCH 04/80] let Z_CheckHeap print file and line of where it occured like its supposed to lel --- src/z_zone.c | 22 +++++++++++----------- src/z_zone.h | 8 +++++--- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/z_zone.c b/src/z_zone.c index 548c1e025..f1d1114e3 100644 --- a/src/z_zone.c +++ b/src/z_zone.c @@ -394,11 +394,11 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb * \param lowtag The lowest tag to consider. * \param hightag The highest tag to consider. */ -void Z_FreeTags(INT32 lowtag, INT32 hightag) +void Z_FreeTags2(INT32 lowtag, INT32 hightag, const char *file, INT32 line) { memblock_t *block, *next; - Z_CheckHeap(420); + Z_CheckHeap2(file, line); for (block = head.next; block != &head; block = next) { next = block->next; // get link before freeing @@ -468,7 +468,7 @@ void Z_CheckMemCleanup(void) * \param i Identifies from where in the code Z_CheckHeap was called. * \author Graue */ -void Z_CheckHeap(INT32 i) +void Z_CheckHeap2(const char *file, INT32 line) { memblock_t *block; UINT32 blocknumon = 0; @@ -498,11 +498,11 @@ void Z_CheckHeap(INT32 i) #endif if (block->user != NULL && *(block->user) != given) { - I_Error("Z_CheckHeap %d: block %u" + I_Error("Z_CheckHeap %s %d: block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " doesn't have a proper user", i, blocknumon + " doesn't have a proper user", file, line, blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -510,11 +510,11 @@ void Z_CheckHeap(INT32 i) } if (block->next->prev != block) { - I_Error("Z_CheckHeap %d: block %u" + I_Error("Z_CheckHeap %s %d: block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " lacks proper backlink", i, blocknumon + " lacks proper backlink", file, line, blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -522,11 +522,11 @@ void Z_CheckHeap(INT32 i) } if (block->prev->next != block) { - I_Error("Z_CheckHeap %d: block %u" + I_Error("Z_CheckHeap %s %d: block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " lacks proper forward link", i, blocknumon + " lacks proper forward link", file, line, blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -534,11 +534,11 @@ void Z_CheckHeap(INT32 i) } if (block->id != ZONEID) { - I_Error("Z_CheckHeap %d: block %u" + I_Error("Z_CheckHeap %s %d: block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " have the wrong ID", i, blocknumon + " have the wrong ID", file, line, blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif diff --git a/src/z_zone.h b/src/z_zone.h index ab908bfec..2d0888e36 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -114,8 +114,9 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb // Free all memory by tag // these don't give line numbers for ZDEBUG currently though // (perhaps this should be changed in future?) -#define Z_FreeTag(tagnum) Z_FreeTags(tagnum, tagnum) -void Z_FreeTags(INT32 lowtag, INT32 hightag); +#define Z_FreeTag(tagnum) Z_FreeTags2(tagnum, tagnum, __FILE__, __LINE__) +#define Z_FreeTags(tagnum, tagnum2) Z_FreeTags2(tagnum, tagnum2, __FILE__, __LINE__) +void Z_FreeTags2(INT32 lowtag, INT32 hightag, const char *file, INT32 line); // Iterate memory by tag #define Z_IterateTag(tagnum, func) Z_IterateTags(tagnum, tagnum, func) @@ -125,7 +126,8 @@ void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *)); // Utility functions // void Z_CheckMemCleanup(void); -void Z_CheckHeap(INT32 i); +#define Z_CheckHeap(tag) Z_CheckHeap2(__FILE__, __LINE__) +void Z_CheckHeap2(const char *file, INT32 line); // // Zone memory modification From 4a4b5661f2e6f808e46147c4fb7db4048244acd5 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 22 Jul 2025 17:24:43 +0200 Subject: [PATCH 05/80] move this stuff behind ZDEBUG --- src/z_zone.c | 64 +++++++++++++++++++++++++++++++++++++++++++++------- src/z_zone.h | 10 ++++++++ 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/src/z_zone.c b/src/z_zone.c index f1d1114e3..ad756ceaa 100644 --- a/src/z_zone.c +++ b/src/z_zone.c @@ -394,11 +394,19 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb * \param lowtag The lowest tag to consider. * \param hightag The highest tag to consider. */ +#ifdef ZDEBUG void Z_FreeTags2(INT32 lowtag, INT32 hightag, const char *file, INT32 line) +#else +void Z_FreeTags(INT32 lowtag, INT32 hightag) +#endif { memblock_t *block, *next; +#ifdef ZDEBUG Z_CheckHeap2(file, line); +#else + Z_CheckHeap(420); +#endif for (block = head.next; block != &head; block = next) { next = block->next; // get link before freeing @@ -468,12 +476,20 @@ void Z_CheckMemCleanup(void) * \param i Identifies from where in the code Z_CheckHeap was called. * \author Graue */ +#ifdef ZDEBUG void Z_CheckHeap2(const char *file, INT32 line) +#else +void Z_CheckHeap(INT32 tag) +#endif { memblock_t *block; UINT32 blocknumon = 0; void *given; +#ifndef ZDEBUG + (void)tag; +#endif + for (block = head.next; block != &head; block = block->next) { blocknumon++; @@ -498,11 +514,19 @@ void Z_CheckHeap2(const char *file, INT32 line) #endif if (block->user != NULL && *(block->user) != given) { - I_Error("Z_CheckHeap %s %d: block %u" + I_Error("Z_CheckHeap" +#ifdef ZDEBUG + "at %s %d :" +#endif + "block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " doesn't have a proper user", file, line, blocknumon + " doesn't have a proper user" +#ifdef ZDEBUG + , file, line +#endif + , blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -510,11 +534,19 @@ void Z_CheckHeap2(const char *file, INT32 line) } if (block->next->prev != block) { - I_Error("Z_CheckHeap %s %d: block %u" + I_Error("Z_CheckHeap" +#ifdef ZDEBUG + "at %s %d :" +#endif + "block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " lacks proper backlink", file, line, blocknumon + " lacks proper backlink" +#ifdef ZDEBUG + , file, line +#endif + , blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -522,11 +554,19 @@ void Z_CheckHeap2(const char *file, INT32 line) } if (block->prev->next != block) { - I_Error("Z_CheckHeap %s %d: block %u" + I_Error("Z_CheckHeap" +#ifdef ZDEBUG + "at %s %d :" +#endif + "block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " lacks proper forward link", file, line, blocknumon + " lacks proper forward link" +#ifdef ZDEBUG + , file, line +#endif + , blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -534,11 +574,19 @@ void Z_CheckHeap2(const char *file, INT32 line) } if (block->id != ZONEID) { - I_Error("Z_CheckHeap %s %d: block %u" + I_Error("Z_CheckHeap" +#ifdef ZDEBUG + "at %s %d :" +#endif + "block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " have the wrong ID", file, line, blocknumon + " have the wrong ID" +#ifdef ZDEBUG + , file, line +#endif + , blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif diff --git a/src/z_zone.h b/src/z_zone.h index 2d0888e36..ba85f5746 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -114,9 +114,14 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb // Free all memory by tag // these don't give line numbers for ZDEBUG currently though // (perhaps this should be changed in future?) +#ifdef ZDEBUG #define Z_FreeTag(tagnum) Z_FreeTags2(tagnum, tagnum, __FILE__, __LINE__) #define Z_FreeTags(tagnum, tagnum2) Z_FreeTags2(tagnum, tagnum2, __FILE__, __LINE__) void Z_FreeTags2(INT32 lowtag, INT32 hightag, const char *file, INT32 line); +#else +#define Z_FreeTag(tagnum) Z_FreeTags(tagnum, tagnum) +void Z_FreeTags(INT32 lowtag, INT32 hightag); +#endif // Iterate memory by tag #define Z_IterateTag(tagnum, func) Z_IterateTags(tagnum, tagnum, func) @@ -126,8 +131,13 @@ void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *)); // Utility functions // void Z_CheckMemCleanup(void); + +#ifdef ZDEBUG #define Z_CheckHeap(tag) Z_CheckHeap2(__FILE__, __LINE__) void Z_CheckHeap2(const char *file, INT32 line); +#else +void Z_CheckHeap(INT32 tag); +#endif // // Zone memory modification From 38576082fba1080a255aac43ea1f8bb15587a7b2 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 22 Jul 2025 17:31:44 +0200 Subject: [PATCH 06/80] move prints to ZDEBUG2 as it seems to be for this purpose --- src/z_zone.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/z_zone.c b/src/z_zone.c index ad756ceaa..bd97707c7 100644 --- a/src/z_zone.c +++ b/src/z_zone.c @@ -149,9 +149,12 @@ void Z_Free(void *ptr) #endif #endif -#ifdef ZDEBUG +#ifdef ZDEBUG2 // Write every Z_Free call to a debug file. CONS_Debug(DBG_MEMORY, "Z_Free at %s:%d\n", file, line); +#elif defined(ZDEBUG) + (void)file; + (void)line; #endif // anything that isn't by lua gets passed to lua just in case. @@ -358,8 +361,10 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb return NULL; #ifdef ZDEBUG +#ifdef ZDEBUG2 // Write every Z_Realloc call to a debug file. DEBFILE(va("Z_Realloc at %s:%d\n", file, line)); +#endif rez = Z_Malloc2(size, tag, user, alignbits, file, line); #else rez = Z_MallocAlign(size, tag, user, alignbits); From 7f3f332821e1a3df9260e90219dbbc49a3adf920 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 22 Jul 2025 17:33:07 +0200 Subject: [PATCH 07/80] Remove aligned allocation functions --- src/i_tcp.c | 8 +- src/r_data.c | 301 +++++++++++++++++++++++++++++++++++++++++++++++-- src/r_draw.cpp | 6 +- src/w_wad.c | 2 +- src/z_zone.c | 49 ++++---- src/z_zone.h | 23 ++-- 6 files changed, 327 insertions(+), 62 deletions(-) diff --git a/src/i_tcp.c b/src/i_tcp.c index 8151abce0..34b96b899 100644 --- a/src/i_tcp.c +++ b/src/i_tcp.c @@ -1475,13 +1475,7 @@ static void AddBannedIndex(void) banned_size *= 2; } - banned = Z_ReallocAlign( - (void*) banned, - sizeof(banned_t) * banned_size, - PU_STATIC, - NULL, - sizeof(banned_t) * 8 - ); + banned = Z_Realloc((void*) banned, sizeof(banned_t) * banned_size, PU_STATIC, NULL); } numbans++; diff --git a/src/r_data.c b/src/r_data.c index f3731c3fc..f25173240 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -1245,6 +1245,94 @@ static void R_InitSpriteLumps(void) Z_Malloc(max_spritelumps*sizeof(*spritecachedinfo), PU_STATIC, &spritecachedinfo); } +// +// R_CreateFadeColormaps +// + +static void R_CreateFadeColormaps(void) +{ + UINT8 px, fade; + RGBA_t rgba; + INT32 r, g, b; + size_t len, i; + + len = (256 * FADECOLORMAPROWS); + fadecolormap = Z_Malloc(len*2, PU_STATIC, NULL); + for (i = 0; i < len*2; i++) + fadecolormap[i] = (i%256); + + // Load in the light tables, now 64k aligned for smokie... + { + lumpnum_t lump = W_CheckNumForName("FADECMAP"); + lumpnum_t wlump = W_CheckNumForName("FADEWMAP"); + + // to black + if (lump != LUMPERROR) + W_ReadLumpHeader(lump, fadecolormap, len, 0U); + // to white + if (wlump != LUMPERROR) + W_ReadLumpHeader(wlump, fadecolormap+len, len, 0U); + + // missing "to white" colormap lump + if (lump != LUMPERROR && wlump == LUMPERROR) + goto makewhite; + // missing "to black" colormap lump + else if (lump == LUMPERROR && wlump != LUMPERROR) + goto makeblack; + // both lumps found + else if (lump != LUMPERROR && wlump != LUMPERROR) + return; + } + +#define GETCOLOR \ + px = colormaps[i%256]; \ + fade = (i/256) * (256 / FADECOLORMAPROWS); \ + rgba = V_GetMasterColor(px); + + // to black + makeblack: + for (i = 0; i < len; i++) + { + // find pixel and fade amount + GETCOLOR; + + // subtractive color blending + r = rgba.s.red - FADEREDFACTOR*fade/10; + g = rgba.s.green - FADEGREENFACTOR*fade/10; + b = rgba.s.blue - FADEBLUEFACTOR*fade/10; + + // clamp values + if (r < 0) r = 0; + if (g < 0) g = 0; + if (b < 0) b = 0; + + // find nearest color in palette + fadecolormap[i] = NearestColor(r,g,b); + } + + // to white + makewhite: + for (i = len; i < len*2; i++) + { + // find pixel and fade amount + GETCOLOR; + + // additive color blending + r = rgba.s.red + FADEREDFACTOR*fade/10; + g = rgba.s.green + FADEGREENFACTOR*fade/10; + b = rgba.s.blue + FADEBLUEFACTOR*fade/10; + + // clamp values + if (r > 255) r = 255; + if (g > 255) g = 255; + if (b > 255) b = 255; + + // find nearest color in palette + fadecolormap[i] = NearestColor(r,g,b); + } +#undef GETCOLOR +} + // // R_InitColormaps // @@ -1254,8 +1342,7 @@ static void R_InitColormaps(void) // Load in the light tables lump = W_GetNumForName("COLORMAP"); - //Z_MallocAlign(W_LumpLength (lump), PU_STATIC, NULL, 8); - colormaps = Z_MallocAlign((256 * 64), PU_STATIC, NULL, 8); + colormaps = Z_Malloc((256 * 64), PU_STATIC, NULL); W_ReadLump(lump, colormaps); // no need to init encoremap at this stage @@ -1296,7 +1383,7 @@ void R_ReInitColormaps(UINT16 num, lumpnum_t newencoremap) lighttable_t *colormap_p, *colormap_p2; size_t p, i; - encoremap = Z_MallocAlign(256 + 10, PU_LEVEL, NULL, 8); + encoremap = Z_Malloc(256 + 10, PU_LEVEL, NULL); W_ReadLump(newencoremap, encoremap); colormap_p = colormap_p2 = colormaps; colormap_p += (256 * 32); @@ -1337,12 +1424,207 @@ void R_ClearColormaps(void) memset(extra_colormaps, 0, sizeof (extra_colormaps)); } -/*INT32 R_ColormapNumForName(char *name) +// +// R_GetDefaultColormap() +// +extracolormap_t *R_GetDefaultColormap(void) { - lumpnum_t lump, i; +#ifdef COLORMAPREVERSELIST + extracolormap_t *exc; +#endif - if (num_extra_colormaps == MAXCOLORMAPS) - I_Error("R_ColormapNumForName: Too many colormaps! the limit is %d\n", MAXCOLORMAPS); + if (!extra_colormaps) + return (extra_colormaps = R_CreateDefaultColormap(true)); + +#ifdef COLORMAPREVERSELIST + for (exc = extra_colormaps; exc->next; exc = exc->next); + return exc; +#else + return extra_colormaps; +#endif +} + +// +// R_CopyColormap() +// NOTE: The result colormap is not added to the extra_colormaps chain. You must do that yourself! +// +extracolormap_t *R_CopyColormap(extracolormap_t *extra_colormap, boolean lighttable) +{ + extracolormap_t *exc = Z_Calloc(sizeof (*exc), PU_LEVEL, NULL); + + if (!extra_colormap) + extra_colormap = R_GetDefaultColormap(); + + *exc = *extra_colormap; + exc->next = exc->prev = NULL; + +#ifdef EXTRACOLORMAPLUMPS + strncpy(exc->lumpname, extra_colormap->lumpname, 9); + + if (exc->lump != LUMPERROR && lighttable) + { + // aligned on 8 bit for asm code + exc->colormap = Z_Malloc(W_LumpLength(lump), PU_LEVEL, NULL); + W_ReadLump(lump, exc->colormap); + } + else +#endif + if (lighttable) + exc->colormap = R_CreateLightTable(exc); + else + exc->colormap = NULL; + + return exc; +} + +// +// R_AddColormapToList +// +// Sets prev/next chain for extra_colormaps var +// Copypasta from P_AddFFloorToList +// +void R_AddColormapToList(extracolormap_t *extra_colormap) +{ +#ifndef COLORMAPREVERSELIST + extracolormap_t *exc; +#endif + + if (!extra_colormaps) + { + extra_colormaps = extra_colormap; + extra_colormap->next = 0; + extra_colormap->prev = 0; + return; + } + +#ifdef COLORMAPREVERSELIST + extra_colormaps->prev = extra_colormap; + extra_colormap->next = extra_colormaps; + extra_colormaps = extra_colormap; + extra_colormap->prev = 0; +#else + for (exc = extra_colormaps; exc->next; exc = exc->next); + + exc->next = extra_colormap; + extra_colormap->prev = exc; + extra_colormap->next = 0; +#endif +} + +// +// R_CheckDefaultColormapByValues() +// +#ifdef EXTRACOLORMAPLUMPS +boolean R_CheckDefaultColormapByValues(boolean checkrgba, boolean checkfadergba, boolean checkparams, + INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, UINT8 flags, lumpnum_t lump) +#else +boolean R_CheckDefaultColormapByValues(boolean checkrgba, boolean checkfadergba, boolean checkparams, + INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, UINT8 flags) +#endif +{ + return ( + (!checkparams ? true : + (fadestart == 0 + && fadeend == 31 + && !flags) + ) + && (!checkrgba ? true : rgba == 0) + && (!checkfadergba ? true : (unsigned)fadergba == 0xFF000000) +#ifdef EXTRACOLORMAPLUMPS + && lump == LUMPERROR + && extra_colormap->lumpname[0] == 0 +#endif + ); +} + +boolean R_CheckDefaultColormap(extracolormap_t *extra_colormap, boolean checkrgba, boolean checkfadergba, boolean checkparams) +{ + if (!extra_colormap) + return true; + +#ifdef EXTRACOLORMAPLUMPS + return R_CheckDefaultColormapByValues(checkrgba, checkfadergba, checkparams, extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->flags, extra_colormap->lump); +#else + return R_CheckDefaultColormapByValues(checkrgba, checkfadergba, checkparams, extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->flags); +#endif +} + +boolean R_CheckEqualColormaps(extracolormap_t *exc_a, extracolormap_t *exc_b, boolean checkrgba, boolean checkfadergba, boolean checkparams) +{ + // Treat NULL as default colormap + // We need this because what if one exc is a default colormap, and the other is NULL? They're really both equal. + if (!exc_a) + exc_a = R_GetDefaultColormap(); + if (!exc_b) + exc_b = R_GetDefaultColormap(); + + if (exc_a == exc_b) + return true; + + return ( + (!checkparams ? true : + (exc_a->fadestart == exc_b->fadestart + && exc_a->fadeend == exc_b->fadeend + && exc_a->flags == exc_b->flags) + ) + && (!checkrgba ? true : exc_a->rgba == exc_b->rgba) + && (!checkfadergba ? true : exc_a->fadergba == exc_b->fadergba) +#ifdef EXTRACOLORMAPLUMPS + && exc_a->lump == exc_b->lump + && !strncmp(exc_a->lumpname, exc_b->lumpname, 9) +#endif + ); +} + +// +// R_GetColormapFromListByValues() +// NOTE: Returns NULL if no match is found +// +#ifdef EXTRACOLORMAPLUMPS +extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, UINT8 flags, lumpnum_t lump) +#else +extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, UINT8 flags) +#endif +{ + extracolormap_t *exc; + UINT32 dbg_i = 0; + + for (exc = extra_colormaps; exc; exc = exc->next) + { + if (rgba == exc->rgba + && fadergba == exc->fadergba + && fadestart == exc->fadestart + && fadeend == exc->fadeend + && flags == exc->flags +#ifdef EXTRACOLORMAPLUMPS + && (lump != LUMPERROR && lump == exc->lump) +#endif + ) + { + CONS_Debug(DBG_RENDER, "Found Colormap %d: rgba(%d,%d,%d,%d) fadergba(%d,%d,%d,%d)\n", + dbg_i, R_GetRgbaR(rgba), R_GetRgbaG(rgba), R_GetRgbaB(rgba), R_GetRgbaA(rgba), + R_GetRgbaR(fadergba), R_GetRgbaG(fadergba), R_GetRgbaB(fadergba), R_GetRgbaA(fadergba)); + return exc; + } + dbg_i++; + } + return NULL; +} + +extracolormap_t *R_GetColormapFromList(extracolormap_t *extra_colormap) +{ +#ifdef EXTRACOLORMAPLUMPS + return R_GetColormapFromListByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->flags, extra_colormap->lump); +#else + return R_GetColormapFromListByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->flags); +#endif +} + +#ifdef EXTRACOLORMAPLUMPS +extracolormap_t *R_ColormapForName(char *name) +{ + lumpnum_t lump; + extracolormap_t *exc; lump = R_CheckNumForNameList(name, colormaplumps, numcolormaplumps); if (lump == LUMPERROR) @@ -1354,8 +1636,7 @@ void R_ClearColormaps(void) foundcolormaps[num_extra_colormaps] = lump; - // aligned on 8 bit for asm code - extra_colormaps[num_extra_colormaps].colormap = Z_MallocAlign(W_LumpLength(lump), PU_LEVEL, NULL, 16); + extra_colormaps[num_extra_colormaps].colormap = Z_Malloc(W_LumpLength(lump), PU_LEVEL, NULL); W_ReadLump(lump, extra_colormaps[num_extra_colormaps].colormap); // We set all params of the colormap to normal because there @@ -1551,7 +1832,7 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3) } // Now allocate memory for the actual colormap array itself! - colormap_p = Z_MallocAlign((256 * (encoremap ? 64 : 32)) + 10, PU_LEVEL, NULL, 8); + colormap_p = Z_Malloc((256 * (encoremap ? 64 : 32)) + 10, PU_LEVEL, NULL); extra_colormaps[mapnum].colormap = (UINT8 *)colormap_p; // Calculate the palette index for each palette index, for each light level diff --git a/src/r_draw.cpp b/src/r_draw.cpp index 23d512a19..e399fab0e 100644 --- a/src/r_draw.cpp +++ b/src/r_draw.cpp @@ -119,7 +119,7 @@ void R_InitTranslucencyTables(void) // Load here the transparency lookup tables 'TRANSx0' // NOTE: the TRANSx0 resources MUST BE aligned on 64k for the asm // optimised code (in other words, transtables pointer low word is 0) - transtables = static_cast(Z_MallocAlign(NUMTRANSTABLES*0x10000, PU_STATIC, NULL, 16)); + transtables = static_cast(Z_Malloc(NUMTRANSTABLES*0x10000, PU_STATIC, NULL)); W_ReadLump(W_GetNumForName("TRANS10"), transtables); W_ReadLump(W_GetNumForName("TRANS20"), transtables+0x10000); @@ -246,7 +246,7 @@ static void R_GenerateBlendTables(void) INT32 i; for (i = 0; i < NUMBLENDMAPS; i++) - blendtables[i] = static_cast(Z_MallocAlign(BlendTab_Count[i] * 0x10000, PU_STATIC, NULL, 16)); + blendtables[i] = static_cast(Z_Malloc(BlendTab_Count[i] * 0x10000, PU_STATIC, NULL)); InitColorLUT(&transtab_lut, pLocalPalette, false); @@ -365,7 +365,7 @@ static UINT8* RGetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 f // Generate the colormap if necessary if (!ret) { - ret = static_cast(Z_MallocAlign(NUM_PALETTE_ENTRIES, (flags & GTC_CACHE) ? PU_LEVEL : PU_STATIC, NULL, 8)); + ret = static_cast(Z_Malloc(NUM_PALETTE_ENTRIES, (flags & GTC_CACHE) ? PU_LEVEL : PU_STATIC, NULL)); K_GenerateKartColormap(ret, skinnum, color, local); //R_GenerateTranslationColormap(ret, skinnum, color); // SRB2kart // Cache the colormap if desired diff --git a/src/w_wad.c b/src/w_wad.c index 6490f561d..63071ea3b 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -611,7 +611,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp) fseek(handle, LONG(zend.cdiroffset), SEEK_SET); - char *cdir = (Z_MallocAlign(LONG(zend.cdirsize), PU_STATIC, &cdir, 7)); + char *cdir = Z_Malloc(LONG(zend.cdirsize), PU_STATIC, &cdir); if (fread(cdir, 1, LONG(zend.cdirsize), handle) < (UINT32)(LONG(zend.cdirsize))) { diff --git a/src/z_zone.c b/src/z_zone.c index bd97707c7..8647f91fa 100644 --- a/src/z_zone.c +++ b/src/z_zone.c @@ -205,7 +205,7 @@ static void *xm(size_t size) return p; } -/** The Z_MallocAlign function. +/** The Z_Malloc function. * Allocates a block of memory, adds it to a linked list so we can keep track of it. * * \param size Amount of memory to be allocated, in bytes. @@ -213,22 +213,19 @@ static void *xm(size_t size) * \param user The address of a pointer to the memory to be allocated. * When the memory is freed by Z_Free later, * the pointer at this address will then be automatically set to NULL. - * \param alignbits The alignment of the memory to be allocated, in bits. Can be 0. * \note You can pass Z_Malloc() a NULL user if the tag is less than PU_PURGELEVEL. - * \sa Z_CallocAlign, Z_ReallocAlign + * \sa Z_Calloc, Z_Realloc */ #ifdef ZDEBUG -void *Z_Malloc2(size_t size, INT32 tag, void *user, INT32 alignbits, +void *Z_Malloc2(size_t size, INT32 tag, void *user, const char *file, INT32 line) #else -void *Z_MallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits) +void *Z_Malloc(size_t size, INT32 tag, void *user) #endif { memblock_t *block; void *ptr; - (void)(alignbits); // no longer used, so silence warnings. TODO we should figure out a solution for this - #ifdef ZDEBUG2 CONS_Debug(DBG_MEMORY, "Z_Malloc %s:%d\n", file, line); #endif @@ -273,55 +270,53 @@ void *Z_MallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits) return ptr; } -/** The Z_CallocAlign function. +/** The Z_Calloc function. * Allocates a block of memory, adds it to a linked list so we can keep track of it. - * Unlike Z_MallocAlign, this also initialises the bytes to zero. + * Unlike Z_Malloc, this also initialises the bytes to zero. * * \param size Amount of memory to be allocated, in bytes. * \param tag Purge tag. * \param user The address of a pointer to the memory to be allocated. * When the memory is freed by Z_Free later, * the pointer at this address will then be automatically set to NULL. - * \param alignbits The alignment of the memory to be allocated, in bits. Can be 0. * \note You can pass Z_Calloc() a NULL user if the tag is less than PU_PURGELEVEL. - * \sa Z_MallocAlign, Z_ReallocAlign + * \sa Z_Malloc, Z_Realloc */ #ifdef ZDEBUG -void *Z_Calloc2(size_t size, INT32 tag, void *user, INT32 alignbits, const char *file, INT32 line) +void *Z_Calloc2(size_t size, INT32 tag, void *user, const char *file, INT32 line) #else -void *Z_CallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits) +void *Z_Calloc(size_t size, INT32 tag, void *user) #endif { #ifdef VALGRIND_MEMPOOL_ALLOC Z_calloc = true; #endif #ifdef ZDEBUG - return memset(Z_Malloc2 (size, tag, user, alignbits, file, line), 0, size); + return memset(Z_Malloc2(size, tag, user, file, line), 0, size); #else - return memset(Z_MallocAlign(size, tag, user, alignbits ), 0, size); + return memset(Z_Malloc (size, tag, user ), 0, size); #endif } -/** The Z_ReallocAlign function. +/** The Z_Realloc function. * Reallocates a block of memory with a new size. * * \param ptr A pointer to allocated memory, * assumed to have been allocated with Z_Malloc/Z_Calloc. - * If NULL, this function instead acts as a wrapper for Z_CallocAlign. + * If NULL, this function instead acts as a wrapper for Z_Calloc. * \param size New size of memory block, in bytes. * If zero, then the memory is freed and NULL is returned. * \param tag New purge tag. * \param user The address of a pointer to the memory to be reallocated. * This can be a different user to the one originally assigned to the memory block. - * \param alignbits The alignment of the memory to be allocated, in bits. Can be 0. * \return A pointer to the reallocated memory. Can be NULL if memory was freed. * \note You can pass Z_Realloc() a NULL user if the tag is less than PU_PURGELEVEL. - * \sa Z_MallocAlign, Z_CallocAlign + * \sa Z_Malloc, Z_Calloc */ #ifdef ZDEBUG -void *Z_Realloc2(void *ptr, size_t size, INT32 tag, void *user, INT32 alignbits, const char *file, INT32 line) +void *Z_Realloc2(void *ptr, size_t size, INT32 tag, void *user, const char *file, INT32 line) #else -void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignbits) +void *Z_Realloc(void *ptr, size_t size, INT32 tag, void *user) #endif { void *rez; @@ -341,9 +336,9 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb if (!ptr) { #ifdef ZDEBUG - return Z_Calloc2(size, tag, user, alignbits, file , line); + return Z_Calloc2(size, tag, user, file, line); #else - return Z_CallocAlign(size, tag, user, alignbits); + return Z_Calloc(size, tag, user); #endif } @@ -351,9 +346,9 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb #ifdef PARANOIA if (block->id != ZONEID) #ifdef ZDEBUG - I_Error("Z_ReallocAlign at %s:%d: wrong id", file, line); + I_Error("Z_Realloc at %s:%d: wrong id", file, line); #else - I_Error("Z_ReallocAlign: wrong id"); + I_Error("Z_Realloc: wrong id"); #endif #endif @@ -365,9 +360,9 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb // Write every Z_Realloc call to a debug file. DEBFILE(va("Z_Realloc at %s:%d\n", file, line)); #endif - rez = Z_Malloc2(size, tag, user, alignbits, file, line); + rez = Z_Malloc2(size, tag, user, file, line); #else - rez = Z_MallocAlign(size, tag, user, alignbits); + rez = Z_Malloc(size, tag, user); #endif if (size < block->realsize) diff --git a/src/z_zone.h b/src/z_zone.h index ba85f5746..0599ef3f6 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -92,25 +92,20 @@ void Z_Init(void); // Z_Free and alloc with alignment #ifdef ZDEBUG #define Z_Free(p) Z_Free2(p, __FILE__, __LINE__) -#define Z_MallocAlign(s,t,u,a) Z_Malloc2(s, t, u, a, __FILE__, __LINE__) -#define Z_CallocAlign(s,t,u,a) Z_Calloc2(s, t, u, a, __FILE__, __LINE__) -#define Z_ReallocAlign(p,s,t,u,a) Z_Realloc2(p,s, t, u, a, __FILE__, __LINE__) +#define Z_Malloc(s,t,u) Z_Malloc2(s, t, u, __FILE__, __LINE__) +#define Z_Calloc(s,t,u) Z_Calloc2(s, t, u, __FILE__, __LINE__) +#define Z_Realloc(p,s,t,u) Z_Realloc2(p,s, t, u, __FILE__, __LINE__) void Z_Free2(void *ptr, const char *file, INT32 line); -void *Z_Malloc2(size_t size, INT32 tag, void *user, INT32 alignbits, const char *file, INT32 line) FUNCALLOC(1); -void *Z_Calloc2(size_t size, INT32 tag, void *user, INT32 alignbits, const char *file, INT32 line) FUNCALLOC(1); -void *Z_Realloc2(void *ptr, size_t size, INT32 tag, void *user, INT32 alignbits, const char *file, INT32 line) FUNCALLOC(2); +void *Z_Malloc2(size_t size, INT32 tag, void *user, const char *file, INT32 line) FUNCALLOC(1); +void *Z_Calloc2(size_t size, INT32 tag, void *user, const char *file, INT32 line) FUNCALLOC(1); +void *Z_Realloc2(void *ptr, size_t size, INT32 tag, void *user, const char *file, INT32 line) FUNCALLOC(2); #else void Z_Free(void *ptr); -void *Z_MallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits) FUNCALLOC(1); -void *Z_CallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits) FUNCALLOC(1); -void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignbits) FUNCALLOC(2); +void *Z_Malloc(size_t size, INT32 tag, void *user) FUNCALLOC(1); +void *Z_Calloc(size_t size, INT32 tag, void *user) FUNCALLOC(1); +void *Z_Realloc(void *ptr, size_t size, INT32 tag, void *user) FUNCALLOC(2); #endif -// Alloc with standard alignment -#define Z_Malloc(s,t,u) Z_MallocAlign(s, t, u, sizeof(void *)) -#define Z_Calloc(s,t,u) Z_CallocAlign(s, t, u, sizeof(void *)) -#define Z_Realloc(p,s,t,u) Z_ReallocAlign(p, s, t, u, sizeof(void *)) - // Free all memory by tag // these don't give line numbers for ZDEBUG currently though // (perhaps this should be changed in future?) From 3c78c5c57dfd5f18f19607c6e6f147cc7ec3fa0e Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 19 Jun 2025 16:26:18 +0200 Subject: [PATCH 08/80] ok git very cool --- src/r_data.c | 292 +-------------------------------------------------- 1 file changed, 5 insertions(+), 287 deletions(-) diff --git a/src/r_data.c b/src/r_data.c index f25173240..689c6541a 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -1245,94 +1245,6 @@ static void R_InitSpriteLumps(void) Z_Malloc(max_spritelumps*sizeof(*spritecachedinfo), PU_STATIC, &spritecachedinfo); } -// -// R_CreateFadeColormaps -// - -static void R_CreateFadeColormaps(void) -{ - UINT8 px, fade; - RGBA_t rgba; - INT32 r, g, b; - size_t len, i; - - len = (256 * FADECOLORMAPROWS); - fadecolormap = Z_Malloc(len*2, PU_STATIC, NULL); - for (i = 0; i < len*2; i++) - fadecolormap[i] = (i%256); - - // Load in the light tables, now 64k aligned for smokie... - { - lumpnum_t lump = W_CheckNumForName("FADECMAP"); - lumpnum_t wlump = W_CheckNumForName("FADEWMAP"); - - // to black - if (lump != LUMPERROR) - W_ReadLumpHeader(lump, fadecolormap, len, 0U); - // to white - if (wlump != LUMPERROR) - W_ReadLumpHeader(wlump, fadecolormap+len, len, 0U); - - // missing "to white" colormap lump - if (lump != LUMPERROR && wlump == LUMPERROR) - goto makewhite; - // missing "to black" colormap lump - else if (lump == LUMPERROR && wlump != LUMPERROR) - goto makeblack; - // both lumps found - else if (lump != LUMPERROR && wlump != LUMPERROR) - return; - } - -#define GETCOLOR \ - px = colormaps[i%256]; \ - fade = (i/256) * (256 / FADECOLORMAPROWS); \ - rgba = V_GetMasterColor(px); - - // to black - makeblack: - for (i = 0; i < len; i++) - { - // find pixel and fade amount - GETCOLOR; - - // subtractive color blending - r = rgba.s.red - FADEREDFACTOR*fade/10; - g = rgba.s.green - FADEGREENFACTOR*fade/10; - b = rgba.s.blue - FADEBLUEFACTOR*fade/10; - - // clamp values - if (r < 0) r = 0; - if (g < 0) g = 0; - if (b < 0) b = 0; - - // find nearest color in palette - fadecolormap[i] = NearestColor(r,g,b); - } - - // to white - makewhite: - for (i = len; i < len*2; i++) - { - // find pixel and fade amount - GETCOLOR; - - // additive color blending - r = rgba.s.red + FADEREDFACTOR*fade/10; - g = rgba.s.green + FADEGREENFACTOR*fade/10; - b = rgba.s.blue + FADEBLUEFACTOR*fade/10; - - // clamp values - if (r > 255) r = 255; - if (g > 255) g = 255; - if (b > 255) b = 255; - - // find nearest color in palette - fadecolormap[i] = NearestColor(r,g,b); - } -#undef GETCOLOR -} - // // R_InitColormaps // @@ -1424,207 +1336,12 @@ void R_ClearColormaps(void) memset(extra_colormaps, 0, sizeof (extra_colormaps)); } -// -// R_GetDefaultColormap() -// -extracolormap_t *R_GetDefaultColormap(void) +/*INT32 R_ColormapNumForName(char *name) { -#ifdef COLORMAPREVERSELIST - extracolormap_t *exc; -#endif + lumpnum_t lump, i; - if (!extra_colormaps) - return (extra_colormaps = R_CreateDefaultColormap(true)); - -#ifdef COLORMAPREVERSELIST - for (exc = extra_colormaps; exc->next; exc = exc->next); - return exc; -#else - return extra_colormaps; -#endif -} - -// -// R_CopyColormap() -// NOTE: The result colormap is not added to the extra_colormaps chain. You must do that yourself! -// -extracolormap_t *R_CopyColormap(extracolormap_t *extra_colormap, boolean lighttable) -{ - extracolormap_t *exc = Z_Calloc(sizeof (*exc), PU_LEVEL, NULL); - - if (!extra_colormap) - extra_colormap = R_GetDefaultColormap(); - - *exc = *extra_colormap; - exc->next = exc->prev = NULL; - -#ifdef EXTRACOLORMAPLUMPS - strncpy(exc->lumpname, extra_colormap->lumpname, 9); - - if (exc->lump != LUMPERROR && lighttable) - { - // aligned on 8 bit for asm code - exc->colormap = Z_Malloc(W_LumpLength(lump), PU_LEVEL, NULL); - W_ReadLump(lump, exc->colormap); - } - else -#endif - if (lighttable) - exc->colormap = R_CreateLightTable(exc); - else - exc->colormap = NULL; - - return exc; -} - -// -// R_AddColormapToList -// -// Sets prev/next chain for extra_colormaps var -// Copypasta from P_AddFFloorToList -// -void R_AddColormapToList(extracolormap_t *extra_colormap) -{ -#ifndef COLORMAPREVERSELIST - extracolormap_t *exc; -#endif - - if (!extra_colormaps) - { - extra_colormaps = extra_colormap; - extra_colormap->next = 0; - extra_colormap->prev = 0; - return; - } - -#ifdef COLORMAPREVERSELIST - extra_colormaps->prev = extra_colormap; - extra_colormap->next = extra_colormaps; - extra_colormaps = extra_colormap; - extra_colormap->prev = 0; -#else - for (exc = extra_colormaps; exc->next; exc = exc->next); - - exc->next = extra_colormap; - extra_colormap->prev = exc; - extra_colormap->next = 0; -#endif -} - -// -// R_CheckDefaultColormapByValues() -// -#ifdef EXTRACOLORMAPLUMPS -boolean R_CheckDefaultColormapByValues(boolean checkrgba, boolean checkfadergba, boolean checkparams, - INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, UINT8 flags, lumpnum_t lump) -#else -boolean R_CheckDefaultColormapByValues(boolean checkrgba, boolean checkfadergba, boolean checkparams, - INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, UINT8 flags) -#endif -{ - return ( - (!checkparams ? true : - (fadestart == 0 - && fadeend == 31 - && !flags) - ) - && (!checkrgba ? true : rgba == 0) - && (!checkfadergba ? true : (unsigned)fadergba == 0xFF000000) -#ifdef EXTRACOLORMAPLUMPS - && lump == LUMPERROR - && extra_colormap->lumpname[0] == 0 -#endif - ); -} - -boolean R_CheckDefaultColormap(extracolormap_t *extra_colormap, boolean checkrgba, boolean checkfadergba, boolean checkparams) -{ - if (!extra_colormap) - return true; - -#ifdef EXTRACOLORMAPLUMPS - return R_CheckDefaultColormapByValues(checkrgba, checkfadergba, checkparams, extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->flags, extra_colormap->lump); -#else - return R_CheckDefaultColormapByValues(checkrgba, checkfadergba, checkparams, extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->flags); -#endif -} - -boolean R_CheckEqualColormaps(extracolormap_t *exc_a, extracolormap_t *exc_b, boolean checkrgba, boolean checkfadergba, boolean checkparams) -{ - // Treat NULL as default colormap - // We need this because what if one exc is a default colormap, and the other is NULL? They're really both equal. - if (!exc_a) - exc_a = R_GetDefaultColormap(); - if (!exc_b) - exc_b = R_GetDefaultColormap(); - - if (exc_a == exc_b) - return true; - - return ( - (!checkparams ? true : - (exc_a->fadestart == exc_b->fadestart - && exc_a->fadeend == exc_b->fadeend - && exc_a->flags == exc_b->flags) - ) - && (!checkrgba ? true : exc_a->rgba == exc_b->rgba) - && (!checkfadergba ? true : exc_a->fadergba == exc_b->fadergba) -#ifdef EXTRACOLORMAPLUMPS - && exc_a->lump == exc_b->lump - && !strncmp(exc_a->lumpname, exc_b->lumpname, 9) -#endif - ); -} - -// -// R_GetColormapFromListByValues() -// NOTE: Returns NULL if no match is found -// -#ifdef EXTRACOLORMAPLUMPS -extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, UINT8 flags, lumpnum_t lump) -#else -extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, UINT8 flags) -#endif -{ - extracolormap_t *exc; - UINT32 dbg_i = 0; - - for (exc = extra_colormaps; exc; exc = exc->next) - { - if (rgba == exc->rgba - && fadergba == exc->fadergba - && fadestart == exc->fadestart - && fadeend == exc->fadeend - && flags == exc->flags -#ifdef EXTRACOLORMAPLUMPS - && (lump != LUMPERROR && lump == exc->lump) -#endif - ) - { - CONS_Debug(DBG_RENDER, "Found Colormap %d: rgba(%d,%d,%d,%d) fadergba(%d,%d,%d,%d)\n", - dbg_i, R_GetRgbaR(rgba), R_GetRgbaG(rgba), R_GetRgbaB(rgba), R_GetRgbaA(rgba), - R_GetRgbaR(fadergba), R_GetRgbaG(fadergba), R_GetRgbaB(fadergba), R_GetRgbaA(fadergba)); - return exc; - } - dbg_i++; - } - return NULL; -} - -extracolormap_t *R_GetColormapFromList(extracolormap_t *extra_colormap) -{ -#ifdef EXTRACOLORMAPLUMPS - return R_GetColormapFromListByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->flags, extra_colormap->lump); -#else - return R_GetColormapFromListByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->flags); -#endif -} - -#ifdef EXTRACOLORMAPLUMPS -extracolormap_t *R_ColormapForName(char *name) -{ - lumpnum_t lump; - extracolormap_t *exc; + if (num_extra_colormaps == MAXCOLORMAPS) + I_Error("R_ColormapNumForName: Too many colormaps! the limit is %d\n", MAXCOLORMAPS); lump = R_CheckNumForNameList(name, colormaplumps, numcolormaplumps); if (lump == LUMPERROR) @@ -1636,6 +1353,7 @@ extracolormap_t *R_ColormapForName(char *name) foundcolormaps[num_extra_colormaps] = lump; + // aligned on 8 bit for asm code extra_colormaps[num_extra_colormaps].colormap = Z_Malloc(W_LumpLength(lump), PU_LEVEL, NULL); W_ReadLump(lump, extra_colormaps[num_extra_colormaps].colormap); From 29cf728fac931ade533b11f932146c1afe55ca78 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 22 Jul 2025 17:29:25 +0200 Subject: [PATCH 09/80] enable ZDEBUG by default this is just quite useful honestly --- src/z_zone.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/z_zone.h b/src/z_zone.h index 0599ef3f6..adbabb37e 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -32,7 +32,7 @@ extern "C" { #define FUNCALLOC(x) #endif -//#define ZDEBUG +#define ZDEBUG // // Purge tags From 9a60441e546015cd09faf3a41136ebbfc1337978 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 23 Jul 2025 17:05:24 +0200 Subject: [PATCH 10/80] few more things for hw renderer just moving aaround some things and declaring more stuff as const --- src/hardware/hw_bsp.c | 5 ++-- src/hardware/hw_clip.c | 2 +- src/hardware/hw_main.cpp | 64 +++++++++++++++++++++------------------- 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c index 76231750c..9357d9f42 100644 --- a/src/hardware/hw_bsp.c +++ b/src/hardware/hw_bsp.c @@ -161,7 +161,7 @@ static boolean SameVertice (polyvertex_t *p1, polyvertex_t *p2) return false; #else #define DIVLINE_VERTEX_DIFF 0.45f - float ep = DIVLINE_VERTEX_DIFF; + static const float ep = DIVLINE_VERTEX_DIFF; if (fabsf( p2->x - p1->x ) > ep ) return false; if (fabsf( p2->y - p1->y ) > ep ) @@ -283,6 +283,7 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line *backpoly = NULL; return; } + if (pe <= ps) I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe); @@ -368,7 +369,7 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly) for (; count--; lseg++) { //x,y,dx,dy (like a divline) - line_t *line = lseg->linedef; + const line_t *line = lseg->linedef; // portal check if (!gl_maphasportals && line->special == PORTALSPECIAL && lseg->side == 0) diff --git a/src/hardware/hw_clip.c b/src/hardware/hw_clip.c index 0329ebc0e..346ed1d7c 100644 --- a/src/hardware/hw_clip.c +++ b/src/hardware/hw_clip.c @@ -121,7 +121,7 @@ static clipnode_t * gld_clipnode_NewRange(angle_t start, angle_t end) boolean gld_clipper_SafeCheckRange(angle_t startAngle, angle_t endAngle) { - if(startAngle > endAngle) + if (startAngle > endAngle) { return (gld_clipper_IsRangeVisible(startAngle, ANGLE_MAX) || gld_clipper_IsRangeVisible(0, endAngle)); } diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index 0504c1597..067fc2b3a 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -1049,7 +1049,7 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, if ((endtop < endrealbot) && (top < realbot)) return; - lightlist_t *list = sector->lightlist; + const lightlist_t *list = sector->lightlist; if (!(list[i].flags & FF_NOSHADE)) { @@ -1387,9 +1387,9 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom wallVerts[2].z = wallVerts[1].z = ve.y; // x offset the texture - fixed_t texturehpeg = gl_sidedef->textureoffset + gl_curline->offset; - float cliplow = (float)texturehpeg; - float cliphigh = (float)(texturehpeg + (gl_curline->flength*FRACUNIT)); + const fixed_t texturehpeg = gl_sidedef->textureoffset + gl_curline->offset; + const float cliplow = (float)texturehpeg; + const float cliphigh = (float)(texturehpeg + (gl_curline->flength*FRACUNIT)); FUINT lightnum = gl_frontsector->lightlevel; extracolormap_t *colormap = gl_frontsector->extra_colormap; @@ -1400,7 +1400,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom if (gl_frontsector) Surf.PolyColor.s.alpha = 255; - INT32 gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture); + const INT32 gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture); GLMapTexture_t *glTex = NULL; // two sided line @@ -1678,7 +1678,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom } // Find the wall's coordinates - fixed_t midtexheight = textureheight[gl_midtexture] * repeats; + const fixed_t midtexheight = textureheight[gl_midtexture] * repeats; if (gl_linedef->flags & ML_EFFECT2) { @@ -2004,6 +2004,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX; wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX; } + FBITFIELD blendmode; if (roverflags & FF_FOG) @@ -3296,7 +3297,7 @@ static gl_vissprite_t gl_overflowsprite; static gl_vissprite_t *HWR_GetVisSprite(UINT32 num) { - UINT32 chunk = num >> VISSPRITECHUNKBITS; + const UINT32 chunk = num >> VISSPRITECHUNKBITS; // Allocate chunk if necessary if (!gl_visspritechunks[chunk]) @@ -3358,13 +3359,6 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t fixed_t slopez; float offset = 0; - // technically this_scale gets multiplied and added to sprite y/x scale, but this thing needs it for some crap so ill just throw it in here again - const boolean hires = (spr->mobj && spr->mobj->skin && K_GetMobjSkin(spr->mobj)->flags & SF_HIRES); - if (spr->mobj) - this_scale = FixedToFloat(spr->mobj->scale); - if (hires) - this_scale = this_scale * FixedToFloat(K_GetMobjSkin(spr->mobj)->highresscale); - R_GetShadowZ(spr->mobj, &floorslope); mobjfloor = HWR_OpaqueFloorAtPos( @@ -3415,6 +3409,14 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t else floorheight = FixedInt(spr->mobj->z - mobjfloor); + // technically this_scale gets multiplied and added to sprite y/x scale, but this thing needs it for some crap so ill just throw it in here again + const boolean hires = (spr->mobj && spr->mobj->skin && K_GetMobjSkin(spr->mobj)->flags & SF_HIRES); + + if (spr->mobj) + this_scale = FixedToFloat(spr->mobj->scale); + if (hires) + this_scale = this_scale * FixedToFloat(K_GetMobjSkin(spr->mobj)->highresscale); + // create the sprite billboard // // 3--2 @@ -4147,8 +4149,8 @@ gl_vissprite_t* gl_vsprorder[MAXVISSPRITES]; // sorted and drawn together with transparent surfaces. static int CompareVisSprites(const void *p1, const void *p2) { - gl_vissprite_t* spr1 = *(gl_vissprite_t*const*)p1; - gl_vissprite_t* spr2 = *(gl_vissprite_t*const*)p2; + const gl_vissprite_t* spr1 = *(gl_vissprite_t*const*)p1; + const gl_vissprite_t* spr2 = *(gl_vissprite_t*const*)p2; int idiff; float fdiff; @@ -4326,8 +4328,8 @@ static void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *poly static int CompareDrawNodePlanes(const void *p1, const void *p2) { - INT32 n1 = *(const INT32*)p1; - INT32 n2 = *(const INT32*)p2; + const INT32 n1 = *(const INT32*)p1; + const INT32 n2 = *(const INT32*)p2; return ABS(drawnodes[n2].u.plane.fixedheight - viewz) - ABS(drawnodes[n1].u.plane.fixedheight - viewz); } @@ -4673,8 +4675,6 @@ static void HWR_ProjectSprite(mobj_t *thing) if (interp.spritexscale < 1 || interp.spriteyscale < 1) return; - const boolean papersprite = (thing->frame & FF_PAPERSPRITE); - INT32 blendmode; if (thing->frame & FF_BLENDMASK) blendmode = ((thing->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1; @@ -4688,6 +4688,8 @@ static void HWR_ProjectSprite(mobj_t *thing) return; } + const boolean papersprite = (thing->frame & FF_PAPERSPRITE); + // transform the origin point tr_x = FixedToFloat(interp.x); tr_y = FixedToFloat(interp.y); @@ -4715,12 +4717,6 @@ static void HWR_ProjectSprite(mobj_t *thing) rot = (thing->frame & FF_FRAMEMASK); -#ifdef ROTSPRITE - // determine here if sprite should rotate for optimization - const boolean sliprollrotate = (cv_sliptideroll.value && (thing->player && thing->player->sliproll)); - const boolean shouldrotate = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || sliprollrotate); -#endif - //Fab : 02-08-98: 'skin' override spritedef currently used for skin if ((thing->skin || thing->localskin) && thing->sprite == SPR_PLAY) { @@ -4759,6 +4755,12 @@ static void HWR_ProjectSprite(mobj_t *thing) I_Error("sprframes NULL for sprite %d\n", thing->sprite); #endif +#ifdef ROTSPRITE + // determine here if sprite should rotate for optimization + const boolean sliprollrotate = (cv_sliptideroll.value && (thing->player && thing->player->sliproll)); + const boolean shouldrotate = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || sliprollrotate); +#endif + if (sprframe->rotate != SRF_SINGLE || papersprite #ifdef ROTSPRITE || (shouldrotate) @@ -5202,13 +5204,13 @@ void HWR_BuildSkyDome(void) { int c, r; signed char yflip; - int row_count = 4; + static constexpr int row_count = 4; int col_count = 4; float delta; gl_sky_t *sky = &gl_sky; gl_skyvertex_t *vertex_p; - texture_t *texture = textures[texturetranslation[skytexture]]; + const texture_t *texture = textures[texturetranslation[skytexture]]; sky->detail = 16; col_count *= sky->detail; @@ -5417,7 +5419,7 @@ void HWR_SetTransform(float fpov) void HWR_ClearClipper(void) { - angle_t a1 = gld_FrustumAngle(gl_aimingangle); + const angle_t a1 = gld_FrustumAngle(gl_aimingangle); gld_clipper_Clear(); gld_clipper_SafeAddClipRange(viewangle + a1, viewangle - a1); #ifdef HAVE_SPHEREFRUSTRUM @@ -5723,6 +5725,8 @@ void HWR_RenderPlayerView(void) HWR_RenderFrame(player, false); } +// Determine on mapload if current map has any Horizonlines present +// so we can avoid rather hot checks in HWR_Subsector static void HWR_CheckForHorizonLines(void) { size_t i; @@ -5976,7 +5980,7 @@ void HWR_Shutdown(void) static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap) { FBITFIELD blendmode = blend; - UINT8 alpha = pSurf->PolyColor.s.alpha; // retain the alpha + const UINT8 alpha = pSurf->PolyColor.s.alpha; // retain the alpha INT32 shader = SHADER_NONE; From 9fb3f4c9a36cce07ed4030e3852cec1d15ab586d Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Jul 2025 15:37:52 +0200 Subject: [PATCH 11/80] fix https://github.com/Indev450/SRB2Kart-Saturn/issues/191 was an oversight when i cleaned up the gamepad stuff a bit --- src/g_game.c | 65 +++++++++++++++++++++++++++------------------------ src/g_input.c | 28 +++++++--------------- src/g_input.h | 13 +++++++---- 3 files changed, 51 insertions(+), 55 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 201d0e013..83be4ecf4 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -681,47 +681,49 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player) INT32 axisval; boolean flp = false; + UINT8 pnum = player-1; + //find what axis to get switch (axissel) { case AXISTURN: - axisval = cv_turnaxis[player-1].value; + axisval = cv_turnaxis[pnum].value; break; case AXISMOVE: - axisval = cv_moveaxis[player-1].value; + axisval = cv_moveaxis[pnum].value; break; case AXISCAMTURN: - axisval = cv_camturnaxis[player-1].value; + axisval = cv_camturnaxis[pnum].value; break; case AXISCAMSTRAFE: - axisval = cv_camstrafeaxis[player-1].value; + axisval = cv_camstrafeaxis[pnum].value; break; case AXISBRAKE: - axisval = cv_brakeaxis[player-1].value; + axisval = cv_brakeaxis[pnum].value; break; case AXISAIM: - axisval = cv_aimaxis[player-1].value; + axisval = cv_aimaxis[pnum].value; break; case AXISLOOK: - axisval = cv_lookaxis[player-1].value; + axisval = cv_lookaxis[pnum].value; break; case AXISFIRE: - axisval = cv_fireaxis[player-1].value; + axisval = cv_fireaxis[pnum].value; break; case AXISDRIFT: - axisval = cv_driftaxis[player-1].value; + axisval = cv_driftaxis[pnum].value; break; case AXISLOOKBACK: - axisval = cv_lookbackaxis[player-1].value; + axisval = cv_lookbackaxis[pnum].value; break; case AXISCUSTOM1: - axisval = cv_custom1axis[player-1].value; + axisval = cv_custom1axis[pnum].value; break; case AXISCUSTOM2: - axisval = cv_custom2axis[player-1].value; + axisval = cv_custom2axis[pnum].value; break; case AXISCUSTOM3: - axisval = cv_custom3axis[player-1].value; + axisval = cv_custom3axis[pnum].value; break; default: return 0; @@ -732,44 +734,51 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player) axisval = -axisval; flp = true; } + if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None return 0; - if (axisval%2) + if (axisval % 2) { axisval /= 2; - retaxis = joyxmove[axisval]; + retaxis = joyxmove[pnum][axisval]; if (retaxis < (-JOYAXISRANGE)) retaxis = -JOYAXISRANGE; if (retaxis > (+JOYAXISRANGE)) retaxis = +JOYAXISRANGE; - if (!Joystick[player-1].bGamepadStyle && axissel < AXISDEAD) + if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD) { - const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[player-1].value) >> FRACBITS; + const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[pnum].value) >> FRACBITS; if (abs(retaxis) <= jdeadzone) return 0; } - if (flp) retaxis = -retaxis; //flip it around + + if (flp) + retaxis = -retaxis; // flip it around + return retaxis; } else { axisval--; axisval /= 2; - retaxis = joyymove[axisval]; + retaxis = joyymove[pnum][axisval]; if (retaxis < (-JOYAXISRANGE)) retaxis = -JOYAXISRANGE; if (retaxis > (+JOYAXISRANGE)) retaxis = +JOYAXISRANGE; - if (!Joystick[player-1].bGamepadStyle && axissel < AXISDEAD) + if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD) { - const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[player-1].value) >> FRACBITS; + const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[pnum].value) >> FRACBITS; if (abs(retaxis) <= jdeadzone) return 0; } - if (flp) retaxis = -retaxis; //flip it around + + if (flp) + retaxis = -retaxis; // flip it around + return retaxis; } } @@ -1216,15 +1225,9 @@ static void G_DoLoadLevel(boolean resetplayer) } // clear cmd building stuff - memset(gamekeydown, 0, sizeof (gamekeydown)); - - for (i = 0; i < JOYAXISSET; i++) - { - joyxmove[i] = joyymove[i] = 0; - joy2xmove[i] = joy2ymove[i] = 0; - joy3xmove[i] = joy3ymove[i] = 0; - joy4xmove[i] = joy4ymove[i] = 0; - } + memset(gamekeydown, 0, sizeof(gamekeydown)); + memset(joyxmove, 0, sizeof(joyxmove)); + memset(joyymove, 0, sizeof(joyymove)); mousex = mousey = 0; // clear hud messages remains (usually from game startup) diff --git a/src/g_input.c b/src/g_input.c index 8d5b38bf2..09ed3303a 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -114,8 +114,7 @@ INT32 mousex, mousey; INT32 mlooky; // like mousey but with a custom sensitivity for mlook // joystick values are repeated -INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET], -joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET]; +INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET]; // current state of the keys: true if pushed UINT8 gamekeydown[NUMINPUTS]; @@ -187,32 +186,32 @@ void G_MapEventsToControls(event_t *ev) i = ev->data1; if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on) break; - if (ev->data2 != INT32_MAX) joyxmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joyymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[0][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[0][i] = ev->data3; break; case ev_joystick2: // buttons are virtual keys i = ev->data1; if (i >= JOYAXISSET || menuactive) break; - if (ev->data2 != INT32_MAX) joy2xmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joy2ymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[1][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[1][i] = ev->data3; break; case ev_joystick3: i = ev->data1; if (i >= JOYAXISSET) break; - if (ev->data2 != INT32_MAX) joy3xmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joy3ymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[2][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[2][i] = ev->data3; break; case ev_joystick4: i = ev->data1; if (i >= JOYAXISSET) break; - if (ev->data2 != INT32_MAX) joy4xmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joy4ymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[3][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[3][i] = ev->data3; break; default: @@ -258,15 +257,6 @@ void G_ResetControls(void) memset(joyxmove, 0, sizeof(joyxmove)); memset(joyymove, 0, sizeof(joyymove)); - memset(joy2xmove, 0, sizeof(joy2xmove)); - memset(joy2ymove, 0, sizeof(joy2ymove)); - - memset(joy3xmove, 0, sizeof(joy3xmove)); - memset(joy3ymove, 0, sizeof(joy3ymove)); - - memset(joy4xmove, 0, sizeof(joy4xmove)); - memset(joy4ymove, 0, sizeof(joy4ymove)); - // reset those just in case the game missed the keyup event memset(dpadscrollstate, false, sizeof(dpadscrollstate)); } diff --git a/src/g_input.h b/src/g_input.h index d801d1020..970560a35 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -41,10 +41,12 @@ typedef enum KEY_DBLJOY1 = KEY_DBLMOUSE1 + MOUSEBUTTONS, KEY_DBLHAT1 = KEY_DBLJOY1 + JOYBUTTONS, - KEY_2JOY1 = KEY_DBLHAT1 + MOUSEBUTTONS, + KEY_2MOUSE1 = KEY_DBLHAT1 + JOYHATS*4, + KEY_2JOY1 = KEY_2MOUSE1 + MOUSEBUTTONS, KEY_2HAT1 = KEY_2JOY1 + JOYBUTTONS, - KEY_DBL2JOY1 = KEY_2HAT1 + MOUSEBUTTONS, + KEY_DBL2MOUSE1 = KEY_2HAT1 + JOYHATS*4, + KEY_DBL2JOY1 = KEY_DBL2MOUSE1 + MOUSEBUTTONS, KEY_DBL2HAT1 = KEY_DBL2JOY1 + JOYBUTTONS, KEY_3JOY1 = KEY_DBL2HAT1 + JOYHATS*4, @@ -61,8 +63,10 @@ typedef enum KEY_MOUSEWHEELUP = KEY_DBL4HAT1 + JOYHATS*4, KEY_MOUSEWHEELDOWN = KEY_MOUSEWHEELUP + 1, + KEY_2MOUSEWHEELUP = KEY_MOUSEWHEELDOWN + 1, + KEY_2MOUSEWHEELDOWN = KEY_2MOUSEWHEELUP + 1, - NUMINPUTS = KEY_MOUSEWHEELDOWN + 1, + NUMINPUTS = KEY_2MOUSEWHEELDOWN + 1, // FIXME: all the mouse 2 stuff should be removed, but it screws up mappings somehow } key_input_e; typedef enum @@ -113,8 +117,7 @@ extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS]; extern INT32 mousex, mousey; extern INT32 mlooky; //mousey with mlookSensitivity -extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET], - joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET]; +extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET]; // current state of the keys: true if pushed extern UINT8 gamekeydown[NUMINPUTS]; From d293bb967252b85aeb3711b389b13054036af85f Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 19 Jul 2025 22:42:00 +0200 Subject: [PATCH 12/80] fix https://github.com/Indev450/SRB2Kart-Saturn/issues/190 doing it like this, so potentially wonky socked maps dont show up if its disabled --- src/m_menu.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index ce69b1eca..8082c1e8c 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -5717,8 +5717,16 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt) { case LLM_CREATESERVER: // Should the map be hidden? <-- well imma wanna toggle it, its just annoying being unable to select hell maps in mapselect - if ((mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU && mapnum+1 != gamemap) && (gt == GT_RACE && (mapheaderinfo[mapnum]->typeoflevel & TOL_RACE))) // map hell - return cv_showallmaps.value; + + if (mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU && mapnum+1 != gamemap) + { + if (cv_showallmaps.value && + ((gt == GT_RACE && (mapheaderinfo[mapnum]->typeoflevel & TOL_RACE)) || // race map hell + ((gt == GT_MATCH || gt == GT_TEAMMATCH) && (mapheaderinfo[mapnum]->typeoflevel & TOL_MATCH)))) // battle map hell + return true; + else + return false; + } // same goes here, just show every map if i want to if (M_MapLocked(mapnum+1)) // not unlocked From c61a2e6ba22f8dd667ed5aa2bad71102b0eee933 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Jul 2025 15:37:52 +0200 Subject: [PATCH 13/80] fix https://github.com/Indev450/SRB2Kart-Saturn/issues/191 was an oversight when i cleaned up the gamepad stuff a bit --- src/g_game.c | 65 +++++++++++++++++++++++++++------------------------ src/g_input.c | 28 +++++++--------------- src/g_input.h | 13 +++++++---- 3 files changed, 51 insertions(+), 55 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 200ce7834..8a786929b 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -751,47 +751,49 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player) INT32 axisval; boolean flp = false; + UINT8 pnum = player-1; + //find what axis to get switch (axissel) { case AXISTURN: - axisval = cv_turnaxis[player-1].value; + axisval = cv_turnaxis[pnum].value; break; case AXISMOVE: - axisval = cv_moveaxis[player-1].value; + axisval = cv_moveaxis[pnum].value; break; case AXISCAMTURN: - axisval = cv_camturnaxis[player-1].value; + axisval = cv_camturnaxis[pnum].value; break; case AXISCAMSTRAFE: - axisval = cv_camstrafeaxis[player-1].value; + axisval = cv_camstrafeaxis[pnum].value; break; case AXISBRAKE: - axisval = cv_brakeaxis[player-1].value; + axisval = cv_brakeaxis[pnum].value; break; case AXISAIM: - axisval = cv_aimaxis[player-1].value; + axisval = cv_aimaxis[pnum].value; break; case AXISLOOK: - axisval = cv_lookaxis[player-1].value; + axisval = cv_lookaxis[pnum].value; break; case AXISFIRE: - axisval = cv_fireaxis[player-1].value; + axisval = cv_fireaxis[pnum].value; break; case AXISDRIFT: - axisval = cv_driftaxis[player-1].value; + axisval = cv_driftaxis[pnum].value; break; case AXISLOOKBACK: - axisval = cv_lookbackaxis[player-1].value; + axisval = cv_lookbackaxis[pnum].value; break; case AXISCUSTOM1: - axisval = cv_custom1axis[player-1].value; + axisval = cv_custom1axis[pnum].value; break; case AXISCUSTOM2: - axisval = cv_custom2axis[player-1].value; + axisval = cv_custom2axis[pnum].value; break; case AXISCUSTOM3: - axisval = cv_custom3axis[player-1].value; + axisval = cv_custom3axis[pnum].value; break; default: return 0; @@ -802,44 +804,51 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player) axisval = -axisval; flp = true; } + if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None return 0; - if (axisval%2) + if (axisval % 2) { axisval /= 2; - retaxis = joyxmove[axisval]; + retaxis = joyxmove[pnum][axisval]; if (retaxis < (-JOYAXISRANGE)) retaxis = -JOYAXISRANGE; if (retaxis > (+JOYAXISRANGE)) retaxis = +JOYAXISRANGE; - if (!Joystick[player-1].bGamepadStyle && axissel < AXISDEAD) + if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD) { - const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[player-1].value) >> FRACBITS; + const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[pnum].value) >> FRACBITS; if (abs(retaxis) <= jdeadzone) return 0; } - if (flp) retaxis = -retaxis; //flip it around + + if (flp) + retaxis = -retaxis; // flip it around + return retaxis; } else { axisval--; axisval /= 2; - retaxis = joyymove[axisval]; + retaxis = joyymove[pnum][axisval]; if (retaxis < (-JOYAXISRANGE)) retaxis = -JOYAXISRANGE; if (retaxis > (+JOYAXISRANGE)) retaxis = +JOYAXISRANGE; - if (!Joystick[player-1].bGamepadStyle && axissel < AXISDEAD) + if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD) { - const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[player-1].value) >> FRACBITS; + const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[pnum].value) >> FRACBITS; if (abs(retaxis) <= jdeadzone) return 0; } - if (flp) retaxis = -retaxis; //flip it around + + if (flp) + retaxis = -retaxis; // flip it around + return retaxis; } } @@ -1286,15 +1295,9 @@ static void G_DoLoadLevel(boolean resetplayer) } // clear cmd building stuff - memset(gamekeydown, 0, sizeof (gamekeydown)); - - for (i = 0; i < JOYAXISSET; i++) - { - joyxmove[i] = joyymove[i] = 0; - joy2xmove[i] = joy2ymove[i] = 0; - joy3xmove[i] = joy3ymove[i] = 0; - joy4xmove[i] = joy4ymove[i] = 0; - } + memset(gamekeydown, 0, sizeof(gamekeydown)); + memset(joyxmove, 0, sizeof(joyxmove)); + memset(joyymove, 0, sizeof(joyymove)); mousex = mousey = 0; // clear hud messages remains (usually from game startup) diff --git a/src/g_input.c b/src/g_input.c index 43b7f48ca..e096b7243 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -114,8 +114,7 @@ INT32 mousex, mousey; INT32 mlooky; // like mousey but with a custom sensitivity for mlook // joystick values are repeated -INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET], -joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET]; +INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET]; // current state of the keys: true if pushed UINT8 gamekeydown[NUMINPUTS]; @@ -187,32 +186,32 @@ void G_MapEventsToControls(event_t *ev) i = ev->data1; if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on) break; - if (ev->data2 != INT32_MAX) joyxmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joyymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[0][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[0][i] = ev->data3; break; case ev_joystick2: // buttons are virtual keys i = ev->data1; if (i >= JOYAXISSET || menuactive) break; - if (ev->data2 != INT32_MAX) joy2xmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joy2ymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[1][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[1][i] = ev->data3; break; case ev_joystick3: i = ev->data1; if (i >= JOYAXISSET) break; - if (ev->data2 != INT32_MAX) joy3xmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joy3ymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[2][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[2][i] = ev->data3; break; case ev_joystick4: i = ev->data1; if (i >= JOYAXISSET) break; - if (ev->data2 != INT32_MAX) joy4xmove[i] = ev->data2; - if (ev->data3 != INT32_MAX) joy4ymove[i] = ev->data3; + if (ev->data2 != INT32_MAX) joyxmove[3][i] = ev->data2; + if (ev->data3 != INT32_MAX) joyymove[3][i] = ev->data3; break; default: @@ -258,15 +257,6 @@ void G_ResetControls(void) memset(joyxmove, 0, sizeof(joyxmove)); memset(joyymove, 0, sizeof(joyymove)); - memset(joy2xmove, 0, sizeof(joy2xmove)); - memset(joy2ymove, 0, sizeof(joy2ymove)); - - memset(joy3xmove, 0, sizeof(joy3xmove)); - memset(joy3ymove, 0, sizeof(joy3ymove)); - - memset(joy4xmove, 0, sizeof(joy4xmove)); - memset(joy4ymove, 0, sizeof(joy4ymove)); - // reset those just in case the game missed the keyup event memset(dpadscrollstate, false, sizeof(dpadscrollstate)); } diff --git a/src/g_input.h b/src/g_input.h index d801d1020..970560a35 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -41,10 +41,12 @@ typedef enum KEY_DBLJOY1 = KEY_DBLMOUSE1 + MOUSEBUTTONS, KEY_DBLHAT1 = KEY_DBLJOY1 + JOYBUTTONS, - KEY_2JOY1 = KEY_DBLHAT1 + MOUSEBUTTONS, + KEY_2MOUSE1 = KEY_DBLHAT1 + JOYHATS*4, + KEY_2JOY1 = KEY_2MOUSE1 + MOUSEBUTTONS, KEY_2HAT1 = KEY_2JOY1 + JOYBUTTONS, - KEY_DBL2JOY1 = KEY_2HAT1 + MOUSEBUTTONS, + KEY_DBL2MOUSE1 = KEY_2HAT1 + JOYHATS*4, + KEY_DBL2JOY1 = KEY_DBL2MOUSE1 + MOUSEBUTTONS, KEY_DBL2HAT1 = KEY_DBL2JOY1 + JOYBUTTONS, KEY_3JOY1 = KEY_DBL2HAT1 + JOYHATS*4, @@ -61,8 +63,10 @@ typedef enum KEY_MOUSEWHEELUP = KEY_DBL4HAT1 + JOYHATS*4, KEY_MOUSEWHEELDOWN = KEY_MOUSEWHEELUP + 1, + KEY_2MOUSEWHEELUP = KEY_MOUSEWHEELDOWN + 1, + KEY_2MOUSEWHEELDOWN = KEY_2MOUSEWHEELUP + 1, - NUMINPUTS = KEY_MOUSEWHEELDOWN + 1, + NUMINPUTS = KEY_2MOUSEWHEELDOWN + 1, // FIXME: all the mouse 2 stuff should be removed, but it screws up mappings somehow } key_input_e; typedef enum @@ -113,8 +117,7 @@ extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS]; extern INT32 mousex, mousey; extern INT32 mlooky; //mousey with mlookSensitivity -extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET], - joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET]; +extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET]; // current state of the keys: true if pushed extern UINT8 gamekeydown[NUMINPUTS]; From bee5250940ba2af08896121faa5678ad6f53d585 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 16:18:13 +0200 Subject: [PATCH 14/80] readd flexible array for softwarepatch columnofs how did this ever work lel --- src/r_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/r_defs.h b/src/r_defs.h index 95f8a796d..a202b49ef 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -668,7 +668,7 @@ typedef struct INT16 height; INT16 leftoffset; // pixels to the left of origin INT16 topoffset; // pixels below the origin - INT32 columnofs[8]; // only [width] used + INT32 columnofs[]; // only [width] used // the [0] is &columnofs[width] } ATTRPACK softwarepatch_t; From 8f1b4004c99fbd15810758326f72d0486becea27 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 18:30:26 +0200 Subject: [PATCH 15/80] fix compiler warning bout playeringame --- src/d_clisrv.c | 14 +++++++------- src/d_netcmd.c | 7 ++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 9625934fc..98b4b1e55 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1693,7 +1693,7 @@ static void SV_SendPlayerInfo(INT32 node) continue; } - if (playeringame[i] == UINT8_MAX || !playeringame[i]) + if (playernode[i] == UINT8_MAX || !playeringame[i]) { netbuffer->u.playerinfo[i].node = 255; // This slot is empty. continue; @@ -5324,18 +5324,18 @@ static void HandlePacketFromPlayer(SINT8 node) /// \todo Use a separate cvar for that kind of timeout? freezetimeout[node] = I_GetTime() + connectiontimeout; - // If we've alredy received a ticcmd for this tic, just submit it for the next one. - tic_t faketic = maketic; - if ((!!(netcmds[maketic % TICQUEUE][netconsole].angleturn & TICCMD_RECEIVED)) - && (maketic - firstticstosend < TICQUEUE - 1)) - faketic++; - // Don't do anything for packets of type NODEKEEPALIVE? // Sryder 2018/07/01: Update the freezetimeout still! if (netbuffer->packettype == PT_NODEKEEPALIVE || netbuffer->packettype == PT_NODEKEEPALIVEMIS) break; + // If we've alredy received a ticcmd for this tic, just submit it for the next one. + tic_t faketic = maketic; + if ((!!(netcmds[maketic % TICQUEUE][netconsole].angleturn & TICCMD_RECEIVED)) + && (maketic - firstticstosend < TICQUEUE - 1)) + faketic++; + // Copy ticcmd G_MoveTiccmd(&netcmds[faketic%TICQUEUE][netconsole], &netbuffer->u.clientpak.cmd, 1); diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 5b8a8c18b..862ebb679 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -216,11 +216,8 @@ static CV_PossibleValue_t teamscramble_cons_t[] = {{0, "Off"}, {1, "Random"}, {2 static CV_PossibleValue_t startingliveslimit_cons_t[] = {{1, "MIN"}, {99, "MAX"}, {0, NULL}}; static CV_PossibleValue_t sleeping_cons_t[] = {{0, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}}; -static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Teleports"}, - {3, "None"}, {0, NULL}}; - -static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Non-Random"}, - {3, "None"}, {0, NULL}}; +static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Teleports"}, {3, "None"}, {0, NULL}}; +static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Non-Random"}, {3, "None"}, {0, NULL}}; //static CV_PossibleValue_t chances_cons_t[] = {{0, "MIN"}, {9, "MAX"}, {0, NULL}}; static CV_PossibleValue_t match_scoring_cons_t[] = {{0, "Normal"}, {1, "Classic"}, {0, NULL}}; From 0f6b9ba181b8fbf8f0618e64dc8a57412825e212 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 21:42:13 +0200 Subject: [PATCH 16/80] remove this prob wrong assumption, our netcode sucks massive ass --- src/d_clisrv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 98b4b1e55..712cf8dc8 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1687,13 +1687,7 @@ static void SV_SendPlayerInfo(INT32 node) for (i = 0; i < MSCOMPAT_MAXPLAYERS; i++) { - if (i >= MAXPLAYERS) - { - netbuffer->u.playerinfo[i].node = 255; - continue; - } - - if (playernode[i] == UINT8_MAX || !playeringame[i]) + if ((i >= MAXPLAYERS) || !playeringame[i]) { netbuffer->u.playerinfo[i].node = 255; // This slot is empty. continue; From 8a89b57e484d5f7e5395bc3487f0071c2f07d059 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 22:11:46 +0200 Subject: [PATCH 17/80] this memset is incorrect and does nothing --- src/d_clisrv.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 712cf8dc8..4e5a1cd9a 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1068,6 +1068,7 @@ static void SV_RequireResynch(INT32 node) // Initial setup memset(resynch_sent[node], 0, MAXPLAYERS); + for (i = 0; i < MAXPLAYERS; ++i) { if (!playeringame[i]) // Player not in game so just drop it from required synch @@ -1772,8 +1773,6 @@ static boolean SV_SendServerConfig(INT32 node) memset(netbuffer->u.servercfg.playerskins, 0xFF, sizeof(netbuffer->u.servercfg.playerskins)); memset(netbuffer->u.servercfg.playercolor, 0xFF, sizeof(netbuffer->u.servercfg.playercolor)); - memset(netbuffer->u.servercfg.adminplayers, -1, sizeof(netbuffer->u.servercfg.adminplayers)); - for (i = 0; i < MAXPLAYERS; i++) { netbuffer->u.servercfg.adminplayers[i] = (SINT8)adminplayers[i]; @@ -3269,7 +3268,7 @@ void CL_ClearPlayer(INT32 playernum) P_RemoveMobj(players[playernum].mo); } - memset(&players[playernum], 0, sizeof (player_t)); + memset(&players[playernum], 0, sizeof(player_t)); } // @@ -4278,14 +4277,14 @@ void SV_ResetServer(void) sprintf(player_names[i], "Player %d", i + 1); } - memset(player_name_changes, 0, sizeof player_name_changes); + memset(player_name_changes, 0, sizeof(player_name_changes)); - memset(playeringame, false, sizeof playeringame); - memset(playernode, UINT8_MAX, sizeof playernode); + memset(playeringame, false, sizeof(playeringame)); + memset(playernode, UINT8_MAX, sizeof(playernode)); pingmeasurecount = 1; - memset(realpingtable, 0, sizeof realpingtable); - memset(playerpingtable, 0, sizeof playerpingtable); + memset(realpingtable, 0, sizeof(realpingtable)); + memset(playerpingtable, 0, sizeof(playerpingtable)); ClearAdminPlayers(); From fc0409e967ae62ebe975d1470b0e751106e2017d Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 11:47:37 +0200 Subject: [PATCH 18/80] readd cubeapply check here --- src/v_video.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/v_video.c b/src/v_video.c index 0f3306696..7df5cacea 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -457,6 +457,9 @@ static void LoadPalette(const char *lumpname) #endif pLocalPalette[i].s.alpha = 0xFF; + if (!Cubeapply) + continue; + // lerp of colour cubing! if you want, make it smoother yourself V_CubeApply(&pLocalPalette[i].s.red, &pLocalPalette[i].s.green, &pLocalPalette[i].s.blue); } From 492aef216510d1086aed4a47efb6bb65f3e99699 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 11:50:08 +0200 Subject: [PATCH 19/80] no need for an else here --- src/p_setup.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index fe3a0d7fc..0459a03f5 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2868,12 +2868,9 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) F_WipeStartScreen(); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); F_WipeEndScreen(); - F_RunWipe(wipedefs[(encoremode ? wipe_level_final : wipe_level_toblack)], false); - } - else //dedicated servers - { - F_RunWipe(wipedefs[(encoremode ? wipe_level_final : wipe_level_toblack)], false); } + + F_RunWipe(wipedefs[(encoremode ? wipe_level_final : wipe_level_toblack)], false); } // Reset the palette now all fades have been done From d8c9522ec95a070bd17c06fa68c3e4d441e1b493 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 13:26:52 +0200 Subject: [PATCH 20/80] add a bunch of checks for if G_BuildMapTitle returns NULL --- src/command.c | 1 - src/d_netcmd.c | 9 +++++++-- src/discord.c | 14 ++++++++++---- src/g_game.c | 11 +++++++---- src/m_menu.c | 52 +++++++++++++++++++++++++++++++++----------------- src/s_sound.c | 9 ++++++--- 6 files changed, 65 insertions(+), 31 deletions(-) diff --git a/src/command.c b/src/command.c index e7dd9cc01..4e43e2cb5 100644 --- a/src/command.c +++ b/src/command.c @@ -240,7 +240,6 @@ void COM_ImmedExecute(const char *ptext) while (i < strlen(ptext)) { - quotes = 0; for (j = 0; i < strlen(ptext); i++,j++) { diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 862ebb679..1970b5323 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2774,7 +2774,7 @@ static void Command_Map_f(void) // G_TOLFlag handles both multiplayer gametype and ignores it for !multiplayer else { - if (!mapheaderinfo[newmapnum-1] || mapheaderinfo[newmapnum-1] == NULL) + if (!mapheaderinfo[newmapnum-1]) { CONS_Alert(CONS_WARNING, M_GetText("Invalid mapheaderinfo for Course %s (%s)\n"), realmapname, G_BuildMapName(newmapnum)); Z_Free(realmapname); @@ -3028,9 +3028,14 @@ static void Command_ReplayMarker(void) adjustedleveltime = 0; char *title = G_BuildMapTitle(gamemap); - snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername); + if (title) + { + snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername); Z_Free(title); + } + else + snprintf(demo.titlename, 64, "[%i:%02d/%.5s]", G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername); CONS_Printf("Replay will be saved!\n"); } diff --git a/src/discord.c b/src/discord.c index cd7dafa8f..207a249a6 100644 --- a/src/discord.c +++ b/src/discord.c @@ -388,7 +388,7 @@ static void DRPC_GotServerIP(UINT32 address) --------------------------------------------------*/ static const char *DRPC_GetServerIP(void) { - const char *address; + const char *address; // If you're connected if (I_GetNodeAddress && (address = I_GetNodeAddress(servernode)) != NULL) @@ -489,7 +489,7 @@ void DRPC_UpdatePresence(void) { #endif discordPresence.state = "Private"; -#ifdef MASTERSERVER +#ifdef MASTERSERVER } #endif @@ -571,9 +571,15 @@ void DRPC_UpdatePresence(void) { // Map name on tool tip char *title = G_BuildMapTitle(gamemap); - snprintf(mapname, 48, "Map: %s", title); + if (title) + { + snprintf(mapname, 48, "Map: %s", title); + Z_Free(title); + } + else + snprintf(mapname, 48, "Map: UNKNOWN"); + discordPresence.largeImageText = mapname; - Z_Free(title); } if (gamestate == GS_LEVEL && Playing()) diff --git a/src/g_game.c b/src/g_game.c index 8a786929b..d5e41f6e0 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -4001,7 +4001,6 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool } } - char *G_BuildMapTitle(INT32 mapnum) { char *title = NULL; @@ -6071,15 +6070,19 @@ void G_BeginRecording(void) char *title = G_BuildMapTitle(gamemap); // Print to a separate temp buffer instead of demo.titlename, so we can use it in M_TextInputSetString - snprintf(demotitlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername); + if (title) + { + snprintf(demotitlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername); + Z_Free(title); + } + else + snprintf(demotitlename, 64, "%s", modeattacking ? "Time Attack" : connectedservername); // Init just in case it isn't initialized already M_TextInputInit(&demo.titlenameinput, demo.titlename, sizeof(demo.titlename)); // This will indirectly assign to demo.titlename too M_TextInputSetString(&demo.titlenameinput, demotitlename); - - Z_Free(title); } // demo checksum diff --git a/src/m_menu.c b/src/m_menu.c index 8082c1e8c..9e207150c 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -7176,8 +7176,11 @@ static void DrawReplayHutReplayInfo(void) if (mapheaderinfo[demolist[dir_on[menudepthleft]].map-1]) { char *title = G_BuildMapTitle(demolist[dir_on[menudepthleft]].map); - V_DrawString(x, y, V_SNAPTOTOP|MENUCAPS, title); - Z_Free(title); + if (title) + { + V_DrawString(x, y, V_SNAPTOTOP|MENUCAPS, title); + Z_Free(title); + } } else V_DrawString(x, y, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "Level is not loaded."); @@ -8129,6 +8132,9 @@ UINT8 skyRoomMenuTranslations[MAXUNLOCKABLES]; static char *M_GetConditionString(condition_t cond) { + char *title = NULL; + char *response = NULL; + switch(cond.type) { case UC_PLAYTIME: @@ -8155,33 +8161,45 @@ static char *M_GetConditionString(condition_t cond) G_TicsToSeconds(cond.requirement)); case UC_MAPVISITED: { - char *title = G_BuildMapTitle(cond.requirement-1); - char *response = va("Visit %s", title); - Z_Free(title); + title = G_BuildMapTitle(cond.requirement-1); + if (title) + { + response = va("Visit %s", title); + Z_Free(title); + } return response; } case UC_MAPBEATEN: { - char *title = G_BuildMapTitle(cond.requirement-1); - char *response = va("Beat %s", title); - Z_Free(title); + title = G_BuildMapTitle(cond.requirement-1); + if (title) + { + response = va("Beat %s", title); + Z_Free(title); + } return response; } case UC_MAPALLEMERALDS: { - char *title = G_BuildMapTitle(cond.requirement-1); - char *response = va("Beat %s w/ all emeralds", title); - Z_Free(title); + title = G_BuildMapTitle(cond.requirement-1); + if (title) + { + response = va("Beat %s w/ all emeralds", title); + Z_Free(title); + } return response; } case UC_MAPTIME: { - char *title = G_BuildMapTitle(cond.extrainfo1-1); - char *response = va("Beat %s in %i:%02i.%02i", title, - G_TicsToMinutes(cond.requirement, true), - G_TicsToSeconds(cond.requirement), - G_TicsToCentiseconds(cond.requirement)); - Z_Free(title); + title = G_BuildMapTitle(cond.extrainfo1-1); + if (title) + { + response = va("Beat %s in %i:%02i.%02i", title, + G_TicsToMinutes(cond.requirement, true), + G_TicsToSeconds(cond.requirement), + G_TicsToCentiseconds(cond.requirement)); + Z_Free(title); + } return response; } case UC_TOTALEMBLEMS: diff --git a/src/s_sound.c b/src/s_sound.c index 922d864d5..cf75df56a 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2042,9 +2042,12 @@ static boolean S_SkipIntroMusic(void) char *maptitle = G_BuildMapTitle(gamemap); // Zzz... - // check if menu music is playing, otherwise it may continue playing - if (!stricmp(music.name, "titles") || (maptitle && (!stricmp(maptitle, "Wandering Falls")))) // wandering balls changes its song when the race starts Zzz... - skip = false; + if (maptitle) + { + // check if menu music is playing, otherwise it may continue playing + if (!stricmp(music.name, "titles") || (maptitle && (!stricmp(maptitle, "Wandering Falls")))) // wandering balls changes its song when the race starts Zzz... + skip = false; + } Z_Free(maptitle); From 2c2c82dc1a65b271ca3078094fc7435c5202af27 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 13:29:25 +0200 Subject: [PATCH 21/80] add mo checks to automap stuff --- src/am_map.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/am_map.c b/src/am_map.c index f91273e8b..11b3796b0 100644 --- a/src/am_map.c +++ b/src/am_map.c @@ -197,7 +197,7 @@ static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF; // used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof) static fixed_t scale_ftom; -static player_t *plr; // the player represented by an arrow +static player_t *plr = NULL; // the player represented by an arrow static boolean followplayer = true; // specifies whether to follow the player around @@ -237,7 +237,7 @@ static inline void AM_restoreScaleAndLoc(void) m_x = old_m_x; m_y = old_m_y; } - else + else if (plr && plr->mo) { m_x = (plr->mo->x >> FRACTOMAPBITS) - m_w/2; m_y = (plr->mo->y >> FRACTOMAPBITS) - m_h/2; @@ -318,7 +318,8 @@ static void AM_initVariables(void) break; plr = &players[pnum]; - if (plr != NULL && plr->mo != NULL) + + if (plr && plr->mo) { m_x = (plr->mo->x >> FRACTOMAPBITS) - m_w/2; m_y = (plr->mo->y >> FRACTOMAPBITS) - m_h/2; @@ -597,6 +598,9 @@ static inline void AM_changeWindowScale(void) static inline void AM_doFollowPlayer(void) { + if (!plr || !plr->mo) + return; + if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y) { m_x = FTOM(MTOF(plr->mo->x >> FRACTOMAPBITS)) - m_w/2; From 8eda0f78f73e64f9ff5cb88eef95cf3dcf88b1e9 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 17:58:00 +0200 Subject: [PATCH 22/80] call HWR_LoadMapTextures in paletterender toggle callback from srb2 pr --- src/hardware/hw_batching.c | 2 +- src/hardware/hw_main.c | 4 ++-- src/st_stuff.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c index 3655beb8a..b8490f4ed 100644 --- a/src/hardware/hw_batching.c +++ b/src/hardware/hw_batching.c @@ -124,7 +124,7 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt polygonArray[polygonArraySize].numVerts = iNumPts; polygonArray[polygonArraySize].polyFlags = PolyFlags; polygonArray[polygonArraySize].texture = current_texture; - polygonArray[polygonArraySize].shader = (shader_target != -1) ? HWR_GetShaderFromTarget(shader_target) : shader_target; + polygonArray[polygonArraySize].shader = (shader_target != SHADER_NONE) ? HWR_GetShaderFromTarget(shader_target) : shader_target; polygonArray[polygonArraySize].horizonSpecial = horizonSpecial; polygonArraySize++; diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 94767ff5d..d2b6a6327 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5750,7 +5750,7 @@ static void HWR_TogglePaletteRendering(void) // If the r_opengl "texture palette" stays the same during this switch, these textures // will not be cleared out. However they are still out of date since the // composite texture blending method has changed. Therefore they need to be cleared. - GL_ClearMipMapCache(); + HWR_LoadMapTextures(numtextures); } } else @@ -5764,7 +5764,7 @@ static void HWR_TogglePaletteRendering(void) // If the r_opengl "texture palette" stays the same during this switch, these textures // will not be cleared out. However they are still out of date since the // composite texture blending method has changed. Therefore they need to be cleared. - GL_ClearMipMapCache(); + HWR_LoadMapTextures(numtextures); } } } diff --git a/src/st_stuff.c b/src/st_stuff.c index 04523f577..4f5401aae 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -187,7 +187,7 @@ void ST_doPaletteStuff(void) #ifdef HWRENDER if (rendermode == render_opengl && !HWR_PalRenderFlashpal()) - palette = 0; // No flashpals here in OpenGL + palette = 0; // Don't set the palette to a flashpal in OpenGL's truecolor mode #endif palette = min(max(palette, 0), 13); From 578158c0603fc4ed8775f454d3a28d91006343df Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 18:17:07 +0200 Subject: [PATCH 23/80] move HWR_GetTexturePalette calls to after early returns/where they are used --- src/hardware/hw_cache.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index 85e50465a..36f6a57a5 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -46,12 +46,16 @@ RGBA_t *HWR_GetTexturePalette(void) static INT32 format2bpp(GLTextureFormat_t format) { - if (format == GL_TEXFMT_RGBA) - return 4; - else if (format == GL_TEXFMT_ALPHA_INTENSITY_88 || format == GL_TEXFMT_AP_88) - return 2; - else - return 1; + switch (format) + { + case GL_TEXFMT_RGBA: + return 4; + case GL_TEXFMT_ALPHA_INTENSITY_88: + case GL_TEXFMT_AP_88: + return 2; + default: + return 1; + } } // This code was originally placed directly in HWR_DrawPatchInCache. @@ -221,8 +225,6 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap, if (texture->width <= 0 || texture->height <= 0) return; - palette = HWR_GetTexturePalette(); - x1 = patch->originx; width = SHORT(realpatch->width); height = SHORT(realpatch->height); @@ -234,6 +236,8 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap, if (patch->originy > texture->height || (patch->originy + height) < 0) return; // patch not located within texture's y bounds, ignore + palette = HWR_GetTexturePalette(); + // patch is actually inside the texture! // now check if texture is partly off-screen and adjust accordingly @@ -323,7 +327,6 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe boolean skyspecial = false; // poor hack for Legacy large skies.. RGBA_t *palette; - palette = HWR_GetTexturePalette(); texture = textures[texnum]; @@ -361,6 +364,8 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe INT32 j; RGBA_t col; + palette = HWR_GetTexturePalette(); + col = palette[HWR_CHROMAKEY_EQUIVALENTCOLORINDEX]; for (idx = 0, j = 0; j < blockheight; j++) From b22737223ecc60d3e3dacc3adba297fe80c24c94 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 18:59:27 +0200 Subject: [PATCH 24/80] didnt mean to change this lel --- src/hardware/hw_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index b8d6ef939..798a10bea 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -223,7 +223,7 @@ FUNCINLINE static ATTRINLINE boolean HWR_ShouldUsePaletteRendering(void) FUNCINLINE static ATTRINLINE boolean HWR_PalRenderFlashpal(void) { - return (HWR_ShouldUsePaletteRendering() && cv_glflashpal.value); + return (cv_glflashpal.value && HWR_ShouldUsePaletteRendering()); } #endif From d2ee344b226b2b53889f80686a991918e9e1606a Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 30 May 2025 02:54:34 +0200 Subject: [PATCH 25/80] Fix underflow in consistancy checking code https://git.srb2.org/Hanicef/SRB2Classic/-/commit/9f5686ef48956cd64ef92f737e59cbbaa27d8cf9 --- src/d_clisrv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 4e5a1cd9a..0135c76cd 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -5388,7 +5388,7 @@ static void HandlePacketFromPlayer(SINT8 node) // Check player consistancy during the level if (gamestate == GS_LEVEL - && (realstart > gametic - TICQUEUE+1 && realstart <= gametic) + && (realstart <= gametic && realstart + TICQUEUE - 1 > gametic) && consistancy[realstart%TICQUEUE] != SHORT(netbuffer->u.clientpak.consistancy) && (!UseSaturnSynch(node) || (!resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime() && !SV_ResendingSavegameToAnyone()))) { @@ -5418,10 +5418,13 @@ static void HandlePacketFromPlayer(SINT8 node) } if (cv_blamecfail.value) + { CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"), netconsole+1, player_names[netconsole], consistancy[realstart%TICQUEUE], SHORT(netbuffer->u.clientpak.consistancy)); + } + DEBFILE(va("Restoring player %d (synch failure) [%update] %d!=%d\n", netconsole, realstart, consistancy[realstart%TICQUEUE], SHORT(netbuffer->u.clientpak.consistancy))); @@ -5693,7 +5696,7 @@ static void HandlePacketFromPlayer(SINT8 node) break; } - //Update client ping table from the server. + // Update client ping table from the server. if (client) { UINT8 i; @@ -6503,7 +6506,6 @@ static inline void PingUpdate(void) if (pingtimeout[i] > 0) pingtimeout[i]--; } - } //kick lagging players... unless everyone but the server's ping sucks. From cfab2236da93de8432d7d0e70bf27282321a0661 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 31 May 2025 15:57:03 +0200 Subject: [PATCH 26/80] fix awayview join crash player->awayviewmobj may not exist yet in some cases --- src/r_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/r_main.c b/src/r_main.c index 5a7d77acd..4d2e6708a 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1062,7 +1062,7 @@ static void R_SetupCommonFrame(player_t * player, sector_t * sector) static void R_SetupAimingFrame(player_t *player, camera_t *thiscam) { - if (player->awayviewtics) + if (player->awayviewtics && player->awayviewmobj) { newview->aim = player->awayviewaiming; newview->angle = player->awayviewmobj->angle; @@ -1168,7 +1168,7 @@ void R_SkyboxFrame(int s) { mapheader_t *mh = mapheaderinfo[gamemap-1]; - if (player->awayviewtics) + if (player->awayviewtics && player->awayviewmobj) { SETUPSKYVIEW(player->awayviewmobj, (player->awayviewmobj->z + 20*FRACUNIT)); } @@ -1225,7 +1225,7 @@ void R_SetupFrame(int s, boolean skybox) R_SetupAimingFrame(player, thiscam); - if (player->awayviewtics) // cut-away view stuff + if (player->awayviewtics && player->awayviewmobj) // cut-away view stuff { viewmobj = player->awayviewmobj; // should be a MT_ALTVIEWMAN I_Assert(viewmobj != NULL); @@ -1234,7 +1234,7 @@ void R_SetupFrame(int s, boolean skybox) newview->y = viewmobj->y; newview->z = viewmobj->z + 20*FRACUNIT; - if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && viewmobj->subsector->sector) + if (viewmobj->subsector && viewmobj->subsector->sector) sector = viewmobj->subsector->sector; R_SetupCommonFrame(player, sector); @@ -1252,7 +1252,7 @@ void R_SetupFrame(int s, boolean skybox) R_SetupCommonFrame(player, sector); } - else // use the player's eyes view + else if (player->mo) // use the player's eyes view { viewmobj = player->mo; I_Assert(viewmobj != NULL); @@ -1261,7 +1261,7 @@ void R_SetupFrame(int s, boolean skybox) newview->y = viewmobj->y; newview->z = player->viewz; - if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && viewmobj->subsector->sector) + if (viewmobj->subsector && viewmobj->subsector->sector) sector = viewmobj->subsector->sector; R_SetupCommonFrame(player, sector); From 7479c82691352af3eb986eda42d658e53e5ac373 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 30 May 2025 20:52:38 +0200 Subject: [PATCH 27/80] some crap from ceepeepeecheck --- src/g_game.c | 51 ++++++++++++++++++++++-------------------- src/g_input.c | 2 +- src/hardware/hw_main.c | 5 ++++- src/k_kart.c | 5 +++-- src/r_data.c | 21 ++++++++++++----- 5 files changed, 51 insertions(+), 33 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index d5e41f6e0..9ace22538 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -5467,33 +5467,36 @@ void G_GhostTicker(void) break; } } - if (type == MT_GHOST) + if (type != -1) { - mobj = P_SpawnGhostMobj(g->mo); // does a large portion of the work for us - mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|tr_trans60<mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK); - mobj->sprite = states[mobjinfo[type].spawnstate].sprite; - mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<tics = -1; // nope. - mobj->color = g->mo->color; - if (g->mo->eflags & MFE_VERTICALFLIP) + if (type == MT_GHOST) { - mobj->flags2 |= MF2_OBJECTFLIP; - mobj->eflags |= MFE_VERTICALFLIP; + mobj = P_SpawnGhostMobj(g->mo); // does a large portion of the work for us + mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|tr_trans60<mo->scale); - mobj->destscale = g->mo->scale; + else + { + mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK); + mobj->sprite = states[mobjinfo[type].spawnstate].sprite; + mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<tics = -1; // nope. + mobj->color = g->mo->color; + if (g->mo->eflags & MFE_VERTICALFLIP) + { + mobj->flags2 |= MF2_OBJECTFLIP; + mobj->eflags |= MFE_VERTICALFLIP; + } + P_SetScale(mobj, g->mo->scale); + mobj->destscale = g->mo->scale; + } + mobj->floorz = mobj->z; + mobj->ceilingz = mobj->z+mobj->height; + P_UnsetThingPosition(mobj); + mobj->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up... + P_SetThingPosition(mobj); + mobj->fuse = 8; + P_SetTarget(&mobj->target, g->mo); } - mobj->floorz = mobj->z; - mobj->ceilingz = mobj->z+mobj->height; - P_UnsetThingPosition(mobj); - mobj->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up... - P_SetThingPosition(mobj); - mobj->fuse = 8; - P_SetTarget(&mobj->target, g->mo); } if (ziptic & EZT_HIT) { // Spawn hit poofs for killing things! @@ -8146,7 +8149,7 @@ void G_SaveDemo(void) size_t i, strindex = 0; boolean dash = true; - for (i = 0; i < 127 && demo.titlename[i]; i++) + for (i = 0; demo.titlename[i] && i < 127; i++) { if ((demo.titlename[i] >= 'a' && demo.titlename[i] <= 'z') || (demo.titlename[i] >= '0' && demo.titlename[i] <= '9')) diff --git a/src/g_input.c b/src/g_input.c index e096b7243..09ed3303a 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -1020,7 +1020,7 @@ INT32 G_KeyStringtoNum(const char *keystr) if (!keystr[0]) return 0; - if (!keystr[0] || (!keystr[1] && keystr[0] > ' ' && keystr[0] <= 'z')) + if (!keystr[1] && keystr[0] > ' ' && keystr[0] <= 'z') return keystr[0]; if (!strncmp(keystr, "KEY", 3) && keystr[3] >= '0' && keystr[3] <= '9') diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index d2b6a6327..8883de69a 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4458,7 +4458,10 @@ static void HWR_DrawModels(void) continue; } - if (spr->mobj && spr->mobj->skin && spr->mobj->sprite == SPR_PLAY) + if (!spr->mobj) + continue; + + if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY) { md2_t *md2; diff --git a/src/k_kart.c b/src/k_kart.c index c63433fb4..5589bdb6e 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10525,11 +10525,12 @@ static void K_drawKartWanted(void) { INT32 x = basex+(splitscreen > 1 ? 13 : 8), y = basey+(splitscreen > 1 ? 16 : 21); fixed_t scale = FRACUNIT/2; - player_t *p = &players[battlewanted[i]]; if (battlewanted[i] == -1) break; + player_t *p = &players[battlewanted[i]]; + if (numwanted == 1) scale = FRACUNIT; else @@ -10540,7 +10541,7 @@ static void K_drawKartWanted(void) y += 16; } - if (players[battlewanted[i]].skincolor) + if (p->skincolor) { colormap = R_GetTranslationColormap(TC_RAINBOW, p->skincolor, GTC_CACHE); V_DrawFixedPatch(x<8) + + if (texturesTokenLength > 8) { I_Error("Error parsing TEXTURES lump: Patch name \"%s\" exceeds 8 characters",texturesToken); } @@ -713,10 +716,12 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch) // Comma 1 Z_Free(texturesToken); texturesToken = M_GetToken(NULL); + if (texturesToken == NULL) { I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after \"%s\"'s patch name should be",patchName); } + if (strcmp(texturesToken,",")!=0) { I_Error("Error parsing TEXTURES lump: Expected \",\" after %s's patch name, got \"%s\"",patchName,texturesToken); @@ -725,14 +730,17 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch) // XPos Z_Free(texturesToken); texturesToken = M_GetToken(NULL); + if (texturesToken == NULL) { I_Error("Error parsing TEXTURES lump: Unexpected end of file where patch \"%s\"'s x coordinate should be",patchName); } + endPos = NULL; #ifndef AVOID_ERRNO errno = 0; #endif + patchXPos = strtol(texturesToken,&endPos,10); (void)patchXPos; //unused for now if (endPos == texturesToken // Empty string @@ -748,10 +756,12 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch) // Comma 2 Z_Free(texturesToken); texturesToken = M_GetToken(NULL); + if (texturesToken == NULL) { I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after patch \"%s\"'s x coordinate should be",patchName); } + if (strcmp(texturesToken,",")!=0) { I_Error("Error parsing TEXTURES lump: Expected \",\" after patch \"%s\"'s x coordinate, got \"%s\"",patchName,texturesToken); @@ -760,6 +770,7 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch) // YPos Z_Free(texturesToken); texturesToken = M_GetToken(NULL); + if (texturesToken == NULL) { I_Error("Error parsing TEXTURES lump: Unexpected end of file where patch \"%s\"'s y coordinate should be",patchName); @@ -1131,9 +1142,9 @@ static void R_InitExtraColormaps(void) lumpnum_t R_GetFlatNumForName(const char *name) { INT32 i; - lumpnum_t lump; - lumpnum_t start; - lumpnum_t end; + lumpnum_t lump = LUMPERROR; + lumpnum_t start = LUMPERROR; + lumpnum_t end = LUMPERROR; // Scan wad files backwards so patched flats take preference. for (i = numwadfiles - 1; i >= 0; i--) @@ -1608,7 +1619,7 @@ const char *R_ColormapNameForNum(INT32 num) if (num == -1) return "NONE"; - if (num < 0 || num > MAXCOLORMAPS) + if (num < 0 || num >= MAXCOLORMAPS) I_Error("R_ColormapNameForNum: num %d is invalid!\n", num); if (foundcolormaps[num] == LUMPERROR) From 1faa585e83cca912906ef9eff7bf8d4fa74571b7 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 30 May 2025 20:56:43 +0200 Subject: [PATCH 28/80] fix memoryleak in pk3 verify functions --- src/w_wad.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/w_wad.c b/src/w_wad.c index 0c7fdbaf0..305e4b3bd 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -2039,8 +2039,7 @@ static lumpchecklist_t folderblacklist[] = {NULL, 0}, }; -static int -W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status) +static int W_VerifyPK3(FILE *fp, lumpchecklist_t *checklist, boolean status) { int verified = true; @@ -2082,7 +2081,10 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status) char *cdir = (char*)(malloc(LONG(zend.cdirsize))); if (fread(cdir, 1, LONG(zend.cdirsize), fp) < (UINT32)(LONG(zend.cdirsize))) + { + free(cdir); return true; + } size_t offset = 0; @@ -2094,7 +2096,10 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status) char* dotpos; if (memcmp(zentry->signature, pat_central, 4) != 0) + { + free(cdir); return true; + } if (verified == true) { @@ -2132,10 +2137,16 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status) sizeof *zentry + SHORT(zentry->namelen) + SHORT(zentry->xtralen) + SHORT(zentry->commlen); if (fseek(fp, LONG(zentry->offset), SEEK_SET) != 0) + { + free(cdir); return true; + } if (fread(&zlentry, 1, sizeof(zlentry_t), fp) < sizeof (zlentry_t)) + { + free(cdir); return true; + } data_size += sizeof zlentry + SHORT(zlentry.namelen) + SHORT(zlentry.xtralen) + LONG(zlentry.compsize); @@ -2186,7 +2197,9 @@ static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist, goodfile = W_VerifyWAD(handle, checklist, status); } } + fclose(handle); + return goodfile; } @@ -2341,7 +2354,10 @@ static int W_CheckPK3Contains(FILE *fp, lumpchecklist_t *checklist) char *cdir = (char*)(malloc(LONG(zend.cdirsize))); if (fread(cdir, 1, LONG(zend.cdirsize), fp) < (UINT32)(LONG(zend.cdirsize))) + { + free(cdir); return true; + } size_t offset = 0; @@ -2353,7 +2369,10 @@ static int W_CheckPK3Contains(FILE *fp, lumpchecklist_t *checklist) char* dotpos; if (memcmp(zentry->signature, pat_central, 4) != 0) + { + free(cdir); return false; + } fullname = (char*)(malloc(SHORT(zentry->namelen) + 1)); strlcpy(fullname, (char*)(zentry + 1), SHORT(zentry->namelen) + 1); @@ -2373,11 +2392,19 @@ static int W_CheckPK3Contains(FILE *fp, lumpchecklist_t *checklist) strncpy(lumpname, trimname, min(8, dotpos - trimname)); if (W_NameStartsWith(lumpname, checklist)) + { + free(fullname); + free(cdir); return true; + } } if (W_NameStartsWith(fullname, checklist)) + { + free(fullname); + free(cdir); return true; + } free(fullname); @@ -2387,10 +2414,16 @@ static int W_CheckPK3Contains(FILE *fp, lumpchecklist_t *checklist) sizeof *zentry + SHORT(zentry->namelen) + SHORT(zentry->xtralen) + SHORT(zentry->commlen); if (fseek(fp, LONG(zentry->offset), SEEK_SET) != 0) + { + free(cdir); return false; + } if (fread(&zlentry, 1, sizeof(zlentry_t), fp) < sizeof (zlentry_t)) + { + free(cdir); return false; + } data_size += sizeof zlentry + SHORT(zlentry.namelen) + SHORT(zlentry.xtralen) + LONG(zlentry.compsize); From d09d2cb4457f94fb4d621c46c6c7bad06ebc2a76 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 31 May 2025 17:20:26 +0200 Subject: [PATCH 29/80] use memcmp during startup map check prob not faster just looks a bit better tbh --- src/d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 728a1a760..e7c9c83cc 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1809,7 +1809,7 @@ void D_SRB2Main(void) { name = lumpinfo->name; - if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P') // Ignore the headers + if (memcmp(name, "MAP", 3) == 0) // Ignore the headers { INT16 num; if (name[5] != '\0') @@ -1839,7 +1839,7 @@ void D_SRB2Main(void) { name = lumpinfo->name; - if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P') // Ignore the headers + if (memcmp(name, "MAP", 3) == 0) // Ignore the headers { INT16 num; if (name[5] != '\0') From 4a2e78081ab43ba934081718fe13cb25aedd51b1 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 31 May 2025 19:55:33 +0200 Subject: [PATCH 30/80] shut up curl im already long --- src/http-mserv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/http-mserv.c b/src/http-mserv.c index 30a6f977d..2831e34e6 100644 --- a/src/http-mserv.c +++ b/src/http-mserv.c @@ -220,9 +220,9 @@ HMS_connect (const char *format, ...) curl_easy_setopt(curl, CURLOPT_URL, url); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); + curl_easy_setopt(curl, CURLOPT_IPRESOLVE, (long)CURL_IPRESOLVE_V4); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, cv_masterserver_timeout.value); + curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)cv_masterserver_timeout.value); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, HMS_on_read); curl_easy_setopt(curl, CURLOPT_WRITEDATA, buffer); @@ -339,8 +339,8 @@ HMS_unlist (void) if (! hms) return 0; - curl_easy_setopt(hms->curl, CURLOPT_POST, 1); - curl_easy_setopt(hms->curl, CURLOPT_POSTFIELDSIZE, 0); + curl_easy_setopt(hms->curl, CURLOPT_POST, (long)1); + curl_easy_setopt(hms->curl, CURLOPT_POSTFIELDSIZE, (long)0); okay = HMS_do(hms); HMS_end(hms); From a84ec88bc3fb1485f03cf054cf9aa220a607c553 Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 2 Jun 2025 14:21:23 +0300 Subject: [PATCH 31/80] dedi's do run got_mapcmd :p --- src/p_setup.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 0459a03f5..a69390961 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2747,8 +2747,6 @@ static void P_SetupPlayer(void) I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755); I_mkdir(va("%s"PATHSEP"replay"PATHSEP"online", srb2home), 0755); G_RecordDemo(buf); - if (dedicated) - G_BeginRecording(); //this has to move here, since dedicated servers dont run got_mapcmd } wantedcalcdelay = wantedfrequency*2; From 1bb7bd0abcaef8d2636d2d6dc5e606b512d07cdb Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Tue, 3 Jun 2025 11:38:46 -0500 Subject: [PATCH 32/80] Fix help command for CV_FLOAT CVars --- src/command.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/command.c b/src/command.c index 4e43e2cb5..b29f15b7b 100644 --- a/src/command.c +++ b/src/command.c @@ -816,12 +816,17 @@ static void COM_Help_f(void) cvar = CV_FindVar(help); if (cvar) { + boolean floatmode = false; + const char *cvalue = NULL; CONS_Printf("\x82""Variable %s:\n", cvar->name); CONS_Printf(M_GetText(" flags: ")); if (cvar->flags & CV_SAVE) CONS_Printf("AUTOSAVE "); if (cvar->flags & CV_FLOAT) + { CONS_Printf("FLOAT "); + floatmode = true; + } if (cvar->flags & CV_NETVAR) CONS_Printf("NETVAR "); if (cvar->flags & CV_CALL) @@ -831,30 +836,38 @@ static void COM_Help_f(void) CONS_Printf("\n"); if (cvar->PossibleValue) { - if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX")) { - CONS_Printf(" range from %d to %d\n", cvar->PossibleValue[0].value, - cvar->PossibleValue[1].value); - i = 2; - } + if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX")) + { + if (floatmode) + CONS_Printf(" range from %f to %f\n", FIXED_TO_FLOAT(cvar->PossibleValue[0].value), + FIXED_TO_FLOAT(cvar->PossibleValue[1].value)); + else + CONS_Printf(" range from %d to %d\n", cvar->PossibleValue[0].value, + cvar->PossibleValue[1].value); + i = 2; + } - { - const char *cvalue = NULL; //CONS_Printf(M_GetText(" possible value : %s\n"), cvar->name); while (cvar->PossibleValue[i].strvalue) { - CONS_Printf(" %-2d : %s\n", cvar->PossibleValue[i].value, - cvar->PossibleValue[i].strvalue); + if (floatmode) + CONS_Printf(" %-2f : %s\n", FIXED_TO_FLOAT(cvar->PossibleValue[i].value), + cvar->PossibleValue[i].strvalue); + else + CONS_Printf(" %-2d : %s\n", cvar->PossibleValue[i].value, + cvar->PossibleValue[i].strvalue); if (cvar->PossibleValue[i].value == cvar->value) cvalue = cvar->PossibleValue[i].strvalue; i++; } - if (cvalue) - CONS_Printf(" Current value: %s\n", cvalue); - else - CONS_Printf(" Current value: %d\n", cvar->value); } } + + if (cvalue) + CONS_Printf(" Current value: %s\n", cvalue); + else if (cvar->string) + CONS_Printf(" Current value: %s\n", cvar->string); else CONS_Printf(" Current value: %d\n", cvar->value); } From 2f5fe01ae0bf6835b1d4c2112747d44535aeb462 Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Tue, 3 Jun 2025 13:18:02 -0500 Subject: [PATCH 33/80] Truncate trailing zeroes in float CVars --- src/command.c | 16 ++++++++++++---- src/m_menu.c | 4 ++-- src/m_misc.c | 19 +++++++++++++++++++ src/m_misc.h | 6 ++++++ 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/command.c b/src/command.c index b29f15b7b..3881246c1 100644 --- a/src/command.c +++ b/src/command.c @@ -838,10 +838,15 @@ static void COM_Help_f(void) { { if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX")) - { + { if (floatmode) - CONS_Printf(" range from %f to %f\n", FIXED_TO_FLOAT(cvar->PossibleValue[0].value), - FIXED_TO_FLOAT(cvar->PossibleValue[1].value)); + { + float fu = FIXED_TO_FLOAT(cvar->PossibleValue[0].value); + float ck = FIXED_TO_FLOAT(cvar->PossibleValue[1].value); + CONS_Printf(" range from %ld%s to %ld%s\n", + (long)fu, M_Ftrim(fu), + (long)ck, M_Ftrim(ck)); + } else CONS_Printf(" range from %d to %d\n", cvar->PossibleValue[0].value, cvar->PossibleValue[1].value); @@ -1038,7 +1043,10 @@ static void COM_Add_f(void) } if (( cvar->flags & CV_FLOAT )) - CV_Set(cvar, va("%f", FIXED_TO_FLOAT (cvar->value) + atof(COM_Argv(2)))); + { + float n =FIXED_TO_FLOAT (cvar->value) + atof(COM_Argv(2)); + CV_Set(cvar, va("%ld%s", (long)n, M_Ftrim(n))); + } else CV_AddValue(cvar, atoi(COM_Argv(2))); } diff --git a/src/m_menu.c b/src/m_menu.c index 9e207150c..1975aafff 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3601,8 +3601,8 @@ static void M_ChangeCvar(INT32 choice) char s[20]; float increment; - increment = (currentMenu->menuitems[itemOn].status & IT_CV_BIGFLOAT) ? 0.5f : (1.0f/16.0f); - sprintf(s, "%f",FIXED_TO_FLOAT(cv->value)+(choice)*increment); + increment = FIXED_TO_FLOAT(cv->value)+(choice)*((currentMenu->menuitems[itemOn].status & IT_CV_BIGFLOAT) ? 0.5f : (1.0f/16.0f)); + sprintf(s,"%ld%s",(long)increment,M_Ftrim(increment)); CV_Set(cv, s); } else diff --git a/src/m_misc.c b/src/m_misc.c index c44086f4c..944fbb73c 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -1965,6 +1965,25 @@ char *M_GetToken(const char *inputString) return texturesToken; } + +const char * M_Ftrim (double f) +{ + static char dig[9];/* "0." + 6 digits (6 is printf's default) */ + int i; + /* I know I said it's the default, but just in case... */ + sprintf(dig, "%.6f", fabs(modf(f, &f))); + /* trim trailing zeroes */ + for (i = strlen(dig)-1; dig[i] == '0'; --i) + ; + if (dig[i] == '.')/* :NOTHING: */ + return ""; + else + { + dig[i + 1] = '\0'; + return &dig[1];/* skip the 0 */ + } +} + /** Count bits in a number. */ UINT8 M_CountBits(UINT32 num, UINT8 size) diff --git a/src/m_misc.h b/src/m_misc.h index 013da2235..98fbdaee7 100644 --- a/src/m_misc.h +++ b/src/m_misc.h @@ -104,6 +104,12 @@ boolean M_IsPathAbsolute (const char *path); void M_MkdirEach (const char *path, int start, int mode); void M_MkdirEachUntil (const char *path, int start, int end, int mode); +/* +Return dot and then the fractional part of a float, without +trailing zeros, or "" if the fractional part is zero. +*/ +const char * M_Ftrim (double); + // counting bits, for weapon ammo code, usually FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size); From e4f2db54e769959eb5432c51a53588009a0d2fdf Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Thu, 12 Jun 2025 11:37:25 -0500 Subject: [PATCH 34/80] Fix level interpolators jittering during objectplac --- src/p_tick.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/p_tick.c b/src/p_tick.c index 3c4583322..5e1af1b68 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -654,6 +654,7 @@ void P_Ticker(boolean run) { P_MapStart(); R_UpdateMobjInterpolators(); + R_UpdateLevelInterpolators(); OP_ObjectplaceMovement(&players[0]); P_MoveChaseCamera(&players[0], &camera[0], false); R_UpdateViewInterpolation(); From fe9107fa9db01d7c84a89076be6ea8b87aafcc21 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 9 Jun 2025 16:58:39 +0200 Subject: [PATCH 35/80] fix the fov adjust check lmao oops --- src/r_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/r_main.c b/src/r_main.c index 4d2e6708a..1cee288a9 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1349,10 +1349,10 @@ void R_RenderPlayerView(player_t *player) for (UINT8 j = 0; j <= splitscreen; j++) { - if (player == &players[displayplayers[i]] - && viewfov[i] != fov) + if (player == &players[displayplayers[j]] + && viewfov[j] != fov) { - viewfov[i] = fov; + viewfov[j] = fov; R_SetFov(fov); } } From 66cfceedaf8cfa942a3c813a5f42b3ceb80c7124 Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 16 Jun 2025 21:43:54 +0300 Subject: [PATCH 36/80] If gamestate resend took too long, abort resynching --- src/d_clisrv.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 0135c76cd..568e14294 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -95,7 +95,7 @@ UINT8 playernode[MAXPLAYERS]; tic_t jointimeout = (3*TICRATE); static boolean sendingsavegame[MAXNETNODES]; // Are we sending the savegame? #ifdef SATURNPAK -static boolean resendingsavegame[MAXNETNODES]; // Are we resending the savegame? +static tic_t resendingsavegame[MAXNETNODES]; // Are we resending the savegame? static tic_t savegameresendcooldown[MAXNETNODES]; // How long before we can resend again? #endif static tic_t freezetimeout[MAXNETNODES]; // Until when can this node freeze the server before getting a timeout? @@ -4244,7 +4244,7 @@ static void ResetNode(INT32 node) // SATURN #ifdef SATURNPAK is_client_saturn[node] = false; - resendingsavegame[node] = false; + resendingsavegame[node] = 0; savegameresendcooldown[node] = 0; gamestate_resend_counter[node] = 0; #endif @@ -4945,7 +4945,7 @@ static void PT_CanReceiveGamestate(SINT8 node) CONS_Printf(M_GetText("Resending game state to %s...\n"), player_names[nodetoplayer[node]]); SV_SendSaveGame(node, true); // Resend a complete game state - resendingsavegame[node] = true; + resendingsavegame[node] = 1; } #endif @@ -5392,7 +5392,7 @@ static void HandlePacketFromPlayer(SINT8 node) && consistancy[realstart%TICQUEUE] != SHORT(netbuffer->u.clientpak.consistancy) && (!UseSaturnSynch(node) || (!resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime() && !SV_ResendingSavegameToAnyone()))) { - resendingsavegame[node] = false; // reset this before just in case + resendingsavegame[node] = 0; // reset this before just in case // Check if a client is saturn before sending ANYTHING! // this way we only send stuff to clients we know can use the gamestate resend @@ -5402,7 +5402,7 @@ static void HandlePacketFromPlayer(SINT8 node) // Tell the client we are about to resend them the gamestate netbuffer->packettype = PT_WILLRESENDGAMESTATE; HSendPacket(node, true, 0, 0); - resendingsavegame[node] = true; + resendingsavegame[node] = 1; } else if (UseVanillaSynch(node)) { @@ -5732,7 +5732,7 @@ static void HandlePacketFromPlayer(SINT8 node) break; case PT_RECEIVEDGAMESTATE: sendingsavegame[node] = false; - resendingsavegame[node] = false; + resendingsavegame[node] = 0; savegameresendcooldown[node] = I_GetTime() + cv_resynchcooldown.value * TICRATE; // I_GetTime() + 5 * TICRATE; break; case PT_WILLRESENDGAMESTATE: @@ -6362,10 +6362,35 @@ static void SV_Maketic(void) maketic++; } +#ifdef SATURNPAK +static void SV_UpdateResendGamestateTimeout(void) +{ + for (INT32 i = 0; i < MAXNETNODES; ++i) + { + if (!resendingsavegame[i]) + continue; + + resendingsavegame[i]++; + + // Resending savegame took too long + if (resendingsavegame[i] > (tic_t)TICRATE*cv_pingtimeout.value) + { + resendingsavegame[i] = 0; + SendKick(i, KICK_MSG_CON_FAIL); + } + } +} +#endif + boolean TryRunTics(tic_t realtics) { boolean ticking; +#ifdef SATURNPAK + if (server) + SV_UpdateResendGamestateTimeout(); +#endif + // the machine has lagged but it is not so bad if (realtics > TICRATE/7) // FIXME: consistency failure!! { From a423451383453b9a038bb87ad752fe2a9bafe1fc Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 23 Jun 2025 18:37:57 +0300 Subject: [PATCH 37/80] SF_HIRES is already handled via spritexscale and spriteyscale --- src/r_things.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/r_things.c b/src/r_things.c index 585274bd3..538e34b74 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -823,8 +823,8 @@ static void R_DrawVisSprite(vissprite_t *vis) frac = vis->startfrac; windowtop = windowbottom = sprbotscreen = INT32_MAX; - if ((vis->mobj->skin || vis->mobj->localskin) && K_GetMobjSkin(vis->mobj)->flags & SF_HIRES) - this_scale = FixedMul(this_scale, K_GetMobjSkin(vis->mobj)->highresscale); + //if ((vis->mobj->skin || vis->mobj->localskin) && K_GetMobjSkin(vis->mobj)->flags & SF_HIRES) + // this_scale = FixedMul(this_scale, K_GetMobjSkin(vis->mobj)->highresscale); if (this_scale <= 0) this_scale = 1; From 384acf8e3135494a6b48ae1c09d6df78aa0a5ac3 Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Mon, 7 Jul 2025 23:19:30 +0200 Subject: [PATCH 38/80] Fix fake floors in Donut Plains disappearing when chasecam is off Also remove the useless R_PointInSubsector calls --- src/r_bsp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/r_bsp.c b/src/r_bsp.c index 427a6367c..9212826cd 100644 --- a/src/r_bsp.c +++ b/src/r_bsp.c @@ -266,10 +266,10 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, boolean underwater; UINT8 i = R_GetViewNumber(); - if (viewplayer == &players[displayplayers[i]] && camera[i].chase) - heightsec = R_PointInSubsector(camera[i].x, camera[i].y)->sector->heightsec; - else if (i > splitscreen && viewmobj) - heightsec = R_PointInSubsector(pviewmobj->x, pviewmobj->y)->sector->heightsec; + if (viewplayer == &players[displayplayers[i]] && camera[R_GetViewNumber()].chase) + heightsec = camera->subsector->sector->heightsec; + else if (viewmobj) + heightsec = pviewmobj->subsector->sector->heightsec; else return sec; From f4da64e3fa901e8778f17ff2252081b911e51af5 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Jul 2025 16:38:44 +0200 Subject: [PATCH 39/80] remove prob pointless check viewplayer will be the currently viewed displayplayer lel --- src/r_bsp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/r_bsp.c b/src/r_bsp.c index 9212826cd..9ffc74673 100644 --- a/src/r_bsp.c +++ b/src/r_bsp.c @@ -264,9 +264,8 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, mobj_t *pviewmobj = viewplayer->mo; INT32 heightsec; boolean underwater; - UINT8 i = R_GetViewNumber(); - if (viewplayer == &players[displayplayers[i]] && camera[R_GetViewNumber()].chase) + if (camera[R_GetViewNumber()].chase) heightsec = camera->subsector->sector->heightsec; else if (viewmobj) heightsec = pviewmobj->subsector->sector->heightsec; From 3b7d517be22f05cd48b6b072ee78a750ff8903cb Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Mon, 14 Jul 2025 16:05:43 +0200 Subject: [PATCH 40/80] bruh Let's try that again, this time putting the camera in a local... --- src/r_bsp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/r_bsp.c b/src/r_bsp.c index 9ffc74673..e07ea88a7 100644 --- a/src/r_bsp.c +++ b/src/r_bsp.c @@ -264,9 +264,10 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, mobj_t *pviewmobj = viewplayer->mo; INT32 heightsec; boolean underwater; + camera_t *thiscam = &camera[R_GetViewNumber()]; - if (camera[R_GetViewNumber()].chase) - heightsec = camera->subsector->sector->heightsec; + if (thiscam->chase) + heightsec = thiscam->subsector->sector->heightsec; else if (viewmobj) heightsec = pviewmobj->subsector->sector->heightsec; else From 76e54762d83928640f82d49eeceacf82d06c62e1 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 19 Jul 2025 22:54:28 +0200 Subject: [PATCH 41/80] add toggle for quake screenshake effects TODO: make an accessability option menu for certain effects --- src/p_local.h | 2 ++ src/p_tick.c | 6 +++--- src/p_user.c | 2 ++ src/r_main.c | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/p_local.h b/src/p_local.h index 38dcc006b..944879fa8 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -158,6 +158,8 @@ extern consvar_t cv_tiltsmoothing; extern consvar_t cv_actionmovie; +extern consvar_t cv_screenquake; + extern consvar_t cv_lookbackmom[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_verticallook[MAXSPLITSCREENPLAYERS]; diff --git a/src/p_tick.c b/src/p_tick.c index 5e1af1b68..9664d50be 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -573,7 +573,7 @@ static void P_RunQuakes(void) { fixed_t ir; - if (quake.time <= 0) + if (!cv_screenquake.value || quake.time <= 0) { quake.x = quake.y = quake.z = quake.roll = 0; return; @@ -618,8 +618,8 @@ static inline void P_ResetSpriteStuff(void) if (!mo || (mo->sprite == SPR_NULL) || (mo->flags2 & MF2_DONTDRAW) || (mo->type == MT_SHADOW)) continue; - mo->spritexscale = mo->realxscale; - mo->spriteyscale = mo->realyscale; + mo->spritexscale = mo->realxscale; + mo->spriteyscale = mo->realyscale; mo->spritexoffset = mo->realxoffset; mo->spriteyoffset = mo->realyoffset; } diff --git a/src/p_user.c b/src/p_user.c index bbf3d2478..d4a36276c 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3044,6 +3044,8 @@ consvar_t cv_tiltsmoothing = {"tiltsmoothing", "32", CV_SAVE, CV_Natural, NULL, consvar_t cv_actionmovie = {"actionmovie", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_screenquake = {"quakescreenshake", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + static CV_PossibleValue_t lookbackmom_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Double"}, {0, NULL}}; consvar_t cv_lookbackmom[MAXSPLITSCREENPLAYERS] = { diff --git a/src/r_main.c b/src/r_main.c index 1cee288a9..3e898a749 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1550,6 +1550,8 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_tiltsmoothing); CV_RegisterVar(&cv_actionmovie); + CV_RegisterVar(&cv_screenquake); + CV_RegisterVar(&cv_driftsparkpulse); CV_RegisterVar(&cv_gravstretch); CV_RegisterVar(&cv_sloperoll); From e681d2d24d79b5f13989391a3d7750ff41a56494 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 18 Jul 2025 17:43:44 +0200 Subject: [PATCH 42/80] remove itemamount check here replicate vanilla even if this becomes negative this does not seem to crash, so id rather do whatever vanilla does --- src/p_inter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_inter.c b/src/p_inter.c index 059bbe15c..ea1aec415 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1542,15 +1542,17 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) { if (target->target->hnext) K_KillBananaChain(target->target->hnext, inflictor, source); + target->target->player->kartstuff[k_itemamount] = 0; } - else if (target->target->player->kartstuff[k_itemamount]) + else target->target->player->kartstuff[k_itemamount]--; } else if ((target->type == MT_ORBINAUT_SHIELD && target->target->player->kartstuff[k_itemtype] == KITEM_ORBINAUT) // orbit items || (target->type == MT_JAWZ_SHIELD && target->target->player->kartstuff[k_itemtype] == KITEM_JAWZ)) { target->target->player->kartstuff[k_itemamount]--; + if (target->lastlook != 0) { K_RepairOrbitChain(target); From fa012aefe1fe689917e2ad0e45d4e0bb565f8a50 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 17:58:25 +0200 Subject: [PATCH 43/80] let Z_CheckHeap print file and line of where it occured like its supposed to lel --- src/z_zone.c | 22 +++++++++++----------- src/z_zone.h | 8 +++++--- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/z_zone.c b/src/z_zone.c index 548c1e025..f1d1114e3 100644 --- a/src/z_zone.c +++ b/src/z_zone.c @@ -394,11 +394,11 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb * \param lowtag The lowest tag to consider. * \param hightag The highest tag to consider. */ -void Z_FreeTags(INT32 lowtag, INT32 hightag) +void Z_FreeTags2(INT32 lowtag, INT32 hightag, const char *file, INT32 line) { memblock_t *block, *next; - Z_CheckHeap(420); + Z_CheckHeap2(file, line); for (block = head.next; block != &head; block = next) { next = block->next; // get link before freeing @@ -468,7 +468,7 @@ void Z_CheckMemCleanup(void) * \param i Identifies from where in the code Z_CheckHeap was called. * \author Graue */ -void Z_CheckHeap(INT32 i) +void Z_CheckHeap2(const char *file, INT32 line) { memblock_t *block; UINT32 blocknumon = 0; @@ -498,11 +498,11 @@ void Z_CheckHeap(INT32 i) #endif if (block->user != NULL && *(block->user) != given) { - I_Error("Z_CheckHeap %d: block %u" + I_Error("Z_CheckHeap %s %d: block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " doesn't have a proper user", i, blocknumon + " doesn't have a proper user", file, line, blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -510,11 +510,11 @@ void Z_CheckHeap(INT32 i) } if (block->next->prev != block) { - I_Error("Z_CheckHeap %d: block %u" + I_Error("Z_CheckHeap %s %d: block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " lacks proper backlink", i, blocknumon + " lacks proper backlink", file, line, blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -522,11 +522,11 @@ void Z_CheckHeap(INT32 i) } if (block->prev->next != block) { - I_Error("Z_CheckHeap %d: block %u" + I_Error("Z_CheckHeap %s %d: block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " lacks proper forward link", i, blocknumon + " lacks proper forward link", file, line, blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -534,11 +534,11 @@ void Z_CheckHeap(INT32 i) } if (block->id != ZONEID) { - I_Error("Z_CheckHeap %d: block %u" + I_Error("Z_CheckHeap %s %d: block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " have the wrong ID", i, blocknumon + " have the wrong ID", file, line, blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif diff --git a/src/z_zone.h b/src/z_zone.h index 41ea1d669..993592d6b 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -110,8 +110,9 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb // Free all memory by tag // these don't give line numbers for ZDEBUG currently though // (perhaps this should be changed in future?) -#define Z_FreeTag(tagnum) Z_FreeTags(tagnum, tagnum) -void Z_FreeTags(INT32 lowtag, INT32 hightag); +#define Z_FreeTag(tagnum) Z_FreeTags2(tagnum, tagnum, __FILE__, __LINE__) +#define Z_FreeTags(tagnum, tagnum2) Z_FreeTags2(tagnum, tagnum2, __FILE__, __LINE__) +void Z_FreeTags2(INT32 lowtag, INT32 hightag, const char *file, INT32 line); // Iterate memory by tag #define Z_IterateTag(tagnum, func) Z_IterateTags(tagnum, tagnum, func) @@ -121,7 +122,8 @@ void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *)); // Utility functions // void Z_CheckMemCleanup(void); -void Z_CheckHeap(INT32 i); +#define Z_CheckHeap(tag) Z_CheckHeap2(__FILE__, __LINE__) +void Z_CheckHeap2(const char *file, INT32 line); // // Zone memory modification From e15319ac9b8e95e28fa4817fdc924ef3773a37a9 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 22 Jul 2025 17:24:43 +0200 Subject: [PATCH 44/80] move this stuff behind ZDEBUG --- src/z_zone.c | 64 +++++++++++++++++++++++++++++++++++++++++++++------- src/z_zone.h | 10 ++++++++ 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/src/z_zone.c b/src/z_zone.c index f1d1114e3..ad756ceaa 100644 --- a/src/z_zone.c +++ b/src/z_zone.c @@ -394,11 +394,19 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb * \param lowtag The lowest tag to consider. * \param hightag The highest tag to consider. */ +#ifdef ZDEBUG void Z_FreeTags2(INT32 lowtag, INT32 hightag, const char *file, INT32 line) +#else +void Z_FreeTags(INT32 lowtag, INT32 hightag) +#endif { memblock_t *block, *next; +#ifdef ZDEBUG Z_CheckHeap2(file, line); +#else + Z_CheckHeap(420); +#endif for (block = head.next; block != &head; block = next) { next = block->next; // get link before freeing @@ -468,12 +476,20 @@ void Z_CheckMemCleanup(void) * \param i Identifies from where in the code Z_CheckHeap was called. * \author Graue */ +#ifdef ZDEBUG void Z_CheckHeap2(const char *file, INT32 line) +#else +void Z_CheckHeap(INT32 tag) +#endif { memblock_t *block; UINT32 blocknumon = 0; void *given; +#ifndef ZDEBUG + (void)tag; +#endif + for (block = head.next; block != &head; block = block->next) { blocknumon++; @@ -498,11 +514,19 @@ void Z_CheckHeap2(const char *file, INT32 line) #endif if (block->user != NULL && *(block->user) != given) { - I_Error("Z_CheckHeap %s %d: block %u" + I_Error("Z_CheckHeap" +#ifdef ZDEBUG + "at %s %d :" +#endif + "block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " doesn't have a proper user", file, line, blocknumon + " doesn't have a proper user" +#ifdef ZDEBUG + , file, line +#endif + , blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -510,11 +534,19 @@ void Z_CheckHeap2(const char *file, INT32 line) } if (block->next->prev != block) { - I_Error("Z_CheckHeap %s %d: block %u" + I_Error("Z_CheckHeap" +#ifdef ZDEBUG + "at %s %d :" +#endif + "block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " lacks proper backlink", file, line, blocknumon + " lacks proper backlink" +#ifdef ZDEBUG + , file, line +#endif + , blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -522,11 +554,19 @@ void Z_CheckHeap2(const char *file, INT32 line) } if (block->prev->next != block) { - I_Error("Z_CheckHeap %s %d: block %u" + I_Error("Z_CheckHeap" +#ifdef ZDEBUG + "at %s %d :" +#endif + "block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " lacks proper forward link", file, line, blocknumon + " lacks proper forward link" +#ifdef ZDEBUG + , file, line +#endif + , blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif @@ -534,11 +574,19 @@ void Z_CheckHeap2(const char *file, INT32 line) } if (block->id != ZONEID) { - I_Error("Z_CheckHeap %s %d: block %u" + I_Error("Z_CheckHeap" +#ifdef ZDEBUG + "at %s %d :" +#endif + "block %u" #ifdef ZDEBUG "(owned by %s:%d)" #endif - " have the wrong ID", file, line, blocknumon + " have the wrong ID" +#ifdef ZDEBUG + , file, line +#endif + , blocknumon #ifdef ZDEBUG , block->ownerfile, block->ownerline #endif diff --git a/src/z_zone.h b/src/z_zone.h index 993592d6b..c921a0b33 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -110,9 +110,14 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb // Free all memory by tag // these don't give line numbers for ZDEBUG currently though // (perhaps this should be changed in future?) +#ifdef ZDEBUG #define Z_FreeTag(tagnum) Z_FreeTags2(tagnum, tagnum, __FILE__, __LINE__) #define Z_FreeTags(tagnum, tagnum2) Z_FreeTags2(tagnum, tagnum2, __FILE__, __LINE__) void Z_FreeTags2(INT32 lowtag, INT32 hightag, const char *file, INT32 line); +#else +#define Z_FreeTag(tagnum) Z_FreeTags(tagnum, tagnum) +void Z_FreeTags(INT32 lowtag, INT32 hightag); +#endif // Iterate memory by tag #define Z_IterateTag(tagnum, func) Z_IterateTags(tagnum, tagnum, func) @@ -122,8 +127,13 @@ void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *)); // Utility functions // void Z_CheckMemCleanup(void); + +#ifdef ZDEBUG #define Z_CheckHeap(tag) Z_CheckHeap2(__FILE__, __LINE__) void Z_CheckHeap2(const char *file, INT32 line); +#else +void Z_CheckHeap(INT32 tag); +#endif // // Zone memory modification From 4492c0084035ed1e9cfb954dcad730a31e85d5ab Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 22 Jul 2025 17:31:44 +0200 Subject: [PATCH 45/80] move prints to ZDEBUG2 as it seems to be for this purpose --- src/z_zone.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/z_zone.c b/src/z_zone.c index ad756ceaa..bd97707c7 100644 --- a/src/z_zone.c +++ b/src/z_zone.c @@ -149,9 +149,12 @@ void Z_Free(void *ptr) #endif #endif -#ifdef ZDEBUG +#ifdef ZDEBUG2 // Write every Z_Free call to a debug file. CONS_Debug(DBG_MEMORY, "Z_Free at %s:%d\n", file, line); +#elif defined(ZDEBUG) + (void)file; + (void)line; #endif // anything that isn't by lua gets passed to lua just in case. @@ -358,8 +361,10 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb return NULL; #ifdef ZDEBUG +#ifdef ZDEBUG2 // Write every Z_Realloc call to a debug file. DEBFILE(va("Z_Realloc at %s:%d\n", file, line)); +#endif rez = Z_Malloc2(size, tag, user, alignbits, file, line); #else rez = Z_MallocAlign(size, tag, user, alignbits); From 03ff2fc007962f3df593f43d090c2e68dd4c48f1 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 22 Jul 2025 17:29:25 +0200 Subject: [PATCH 46/80] enable ZDEBUG by default this is just quite useful honestly --- src/z_zone.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/z_zone.h b/src/z_zone.h index c921a0b33..23eea9bb3 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -28,7 +28,7 @@ #define FUNCALLOC(x) #endif -//#define ZDEBUG +#define ZDEBUG // // Purge tags From 3e9f17af865d47a80f8fcedd2ad630213cd7ebcd Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Jul 2025 17:17:49 +0200 Subject: [PATCH 47/80] raise version number to 8.3 so i dont forger before release lul --- src/doomdef.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index f9467199b..a4daaafbb 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -113,8 +113,8 @@ extern char logfilename[1024]; #else #define VERSION 1 // Game version #define SUBVERSION 6 // more precise version number -#define VERSIONSTRING "Saturn v8.2" -#define VERSIONSTRINGW L"Saturn v8.2" +#define VERSIONSTRING "Saturn v8.3" +#define VERSIONSTRINGW L"Saturn v8.3" // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates! // And change CMakeLists.txt (not src/, but in root), for CMake users! // AND appveyor.yml, for the build bots! From ffec9d64d596fb26f114716d7a508daad4e8ee7d Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 12 Jul 2025 14:54:39 +0200 Subject: [PATCH 48/80] delet windoze users (winuser.h) apparently this makes cross compile commit sudoku, need to test this on actual windoze and see if this breaks anything since idk how this file even works thx nep for the tip! --- src/win32/Srb2win.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc index d7a26dc85..da6c64d82 100644 --- a/src/win32/Srb2win.rc +++ b/src/win32/Srb2win.rc @@ -1,5 +1,3 @@ -#include - //Microsoft Developer Studio generated resource script. // #include "resource.h" From 45629386bbc6f97aab27d0264479ab4bef4f93ba Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Jul 2025 19:03:06 +0200 Subject: [PATCH 49/80] update credits this is super full and we need to think about something better for this X) --- src/f_finale.c | 2 ++ src/m_menu.c | 50 ++++++++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index dd024ecd0..ff44da1a5 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -540,6 +540,8 @@ static const char *credits[] = { "\"Jin\"", "\"riomccloud\"", "\"chromaticpipe\"", + "\"PAS\"", + "\"$HOME\"", "\"Achii\"", "\"Anonimus\"", "\"scizor300\"", diff --git a/src/m_menu.c b/src/m_menu.c index 1975aafff..256e45b82 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2465,32 +2465,38 @@ static menuitem_t OP_HudOffsetMenu[] = {IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_stat_yoffset, 185}, }; +// FIXME: WE EFFECTIVELY HAVE NO MORE SPACE FOR GREEN RES +// i had to put multiple names into single lines at this point +// we ought to really do something better for this at this point +// absolutely crazy how many people put work into this at this point <3 static menuitem_t OP_SaturnCreditsMenu[] = { - {IT_HEADER, NULL, "Saturn Credits", NULL, 0}, + {IT_HEADER, NULL, "Thanks to all contributers <3", NULL, 0}, - {IT_HEADER, NULL, "Thanks to all contributers <3", NULL, 7}, + {IT_STRING2+IT_SPACE, NULL, "Alug", NULL, 10}, + {IT_STRING2+IT_SPACE, NULL, "Indev", NULL, 20}, + {IT_STRING2+IT_SPACE, NULL, "Haya", NULL, 30}, + {IT_STRING2+IT_SPACE, NULL, "Nepdisk", NULL, 40}, + {IT_STRING2+IT_SPACE, NULL, "GenericHeroGuy", NULL, 50}, + {IT_STRING2+IT_SPACE, NULL, "xyzzy", NULL, 60}, + {IT_STRING2+IT_SPACE, NULL, "Chearii", NULL, 70}, + {IT_STRING2+IT_SPACE, NULL, "riomccloud", NULL, 80}, + {IT_STRING2+IT_SPACE, NULL, "chromaticpipe", NULL, 90}, + {IT_STRING2+IT_SPACE, NULL, "PAS", NULL, 100}, + {IT_STRING2+IT_SPACE, NULL, "$HOME", NULL, 110}, + {IT_STRING2+IT_SPACE, NULL, "Achii", NULL, 120}, + {IT_STRING2+IT_SPACE, NULL, "Anonimus", NULL, 130}, + {IT_STRING2+IT_SPACE, NULL, "scizor300", NULL, 140}, + {IT_STRING2+IT_SPACE, NULL, "Lugent", NULL, 150}, - {IT_STRING2+IT_SPACE, NULL, "Alug", NULL, 17}, - {IT_STRING2+IT_SPACE, NULL, "Indev", NULL, 27}, - {IT_STRING2+IT_SPACE, NULL, "Haya", NULL, 37}, - {IT_STRING2+IT_SPACE, NULL, "Nepdisk", NULL, 47}, - {IT_STRING2+IT_SPACE, NULL, "GenericHeroGuy", NULL, 57}, - {IT_STRING2+IT_SPACE, NULL, "xyzzy", NULL, 67}, - {IT_STRING2+IT_SPACE, NULL, "Chearii", NULL, 77}, + {IT_HEADER, NULL, "", NULL, 124}, - {IT_STRING2+IT_SPACE, NULL, "Sunflower aka AnimeSonic", NULL, 87}, - {IT_STRING2+IT_SPACE, NULL, "Yuz aka Yuzler", NULL, 97}, - {IT_STRING2+IT_SPACE, NULL, "Democrab", NULL, 107}, - {IT_STRING2+IT_SPACE, NULL, "EXpand", NULL, 117}, - {IT_STRING2+IT_SPACE, NULL, "Nexit", NULL, 127}, - {IT_STRING2+IT_SPACE, NULL, "Spee", NULL, 137}, - {IT_STRING2+IT_SPACE, NULL, "jin", NULL, 147}, - {IT_STRING2+IT_SPACE, NULL, "riomccloud", NULL, 157}, - {IT_STRING2+IT_SPACE, NULL, "chromaticpipe", NULL, 167}, - {IT_STRING2+IT_SPACE, NULL, "Achii", NULL, 177}, - {IT_STRING2+IT_SPACE, NULL, "Anonimus", NULL, 187}, - {IT_STRING2+IT_SPACE, NULL, "scizor300", NULL, 197}, + {IT_STRING2+IT_SPACE, NULL, "Sunflower Yuz", NULL, 180}, + {IT_STRING2+IT_SPACE, NULL, "Democrab EXpand", NULL, 190}, + {IT_STRING2+IT_SPACE, NULL, "Nexit Spee", NULL, 200}, + {IT_STRING2+IT_SPACE, NULL, "jin", NULL, 210}, + + {IT_HEADER, NULL, "Special Thanks <3", NULL, 168}, {IT_HEADER, NULL, "Special Thanks <3", NULL, 167}, @@ -2502,7 +2508,7 @@ static menuitem_t OP_SaturnCreditsMenu[] = {IT_STRING, NULL, "", NULL, 267}, // dummy text II }; -// sry we dont have space for this anymore :/ +// sry we dont have space for this anymore :c /*static const char* OP_CreditTooltips[] = { NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, From d94c10014f129da926e234d56bd41ecb2bfb1d77 Mon Sep 17 00:00:00 2001 From: Indev Date: Thu, 24 Jul 2025 21:20:07 +0300 Subject: [PATCH 50/80] Move server search below refresh option --- src/m_menu.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 0000fae90..04f7bc6ff 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1114,10 +1114,10 @@ static menuitem_t MP_PlayerSetupMenu[] = #ifndef NONET static menuitem_t MP_ConnectMenu[] = { - {IT_STRING | IT_KEYHANDLER, NULL, "", M_HandleServerSearch,0}, - {IT_STRING | IT_CVAR, NULL, "Sort By", &cv_serversort, 16}, - {IT_STRING | IT_KEYHANDLER, NULL, "Page", M_HandleServerPage, 24}, - {IT_STRING | IT_CALL, NULL, "Refresh", M_Refresh, 32}, + {IT_STRING | IT_CVAR, NULL, "Sort By", &cv_serversort, 0}, + {IT_STRING | IT_KEYHANDLER, NULL, "Page", M_HandleServerPage, 8}, + {IT_STRING | IT_CALL, NULL, "Refresh", M_Refresh, 16}, + {IT_STRING | IT_KEYHANDLER, NULL, "", M_HandleServerSearch,25}, {IT_STRING | IT_SPACE, NULL, "", M_Connect, 48}, {IT_STRING | IT_SPACE, NULL, "", M_Connect, 60}, @@ -1133,10 +1133,10 @@ static menuitem_t MP_ConnectMenu[] = enum { - mp_connect_search, mp_connect_sort, mp_connect_page, mp_connect_refresh, + mp_connect_search, FIRSTSERVERLINE }; #endif @@ -9884,15 +9884,16 @@ static void M_DrawConnectMenu(void) M_DrawServerLines(currentMenu->x, serverlistpage); } - V_DrawFill(currentMenu->x, currentMenu->y, MAXSTRINGLENGTH*8+6, 8+6, 239); + INT32 input_y = currentMenu->menuitems[mp_connect_search].alphaKey; + + V_DrawFill(currentMenu->x, currentMenu->y+input_y, MAXSTRINGLENGTH*8+6, 8+6, 239); const INT32 xoff = 3, yoff = 3; - - if (itemOn != 0) - V_DrawString(currentMenu->x+xoff, currentMenu->y+yoff, V_ALLOWLOWERCASE, menuinput.buffer); + if (itemOn != mp_connect_search) + V_DrawString(currentMenu->x+xoff, currentMenu->y+yoff+input_y, V_ALLOWLOWERCASE, menuinput.buffer); else - M_DrawTextInput(currentMenu->x+xoff, currentMenu->y+yoff, &menuinput, 0); + M_DrawTextInput(currentMenu->x+xoff, currentMenu->y+yoff+input_y, &menuinput, 0); localservercount = serverlistcount; From a658883664235b2a29e693629e9dbebfa2478efd Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Jul 2025 20:39:50 +0200 Subject: [PATCH 51/80] fix console taking minutes to open during frameskipping prob not the best way to handle this, but its the simplest the console should always be openable without issues unless during wipes, since in some cases you end up having to kill the game to do anything --- src/d_main.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 3563f5949..71835c2e3 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -896,9 +896,25 @@ void D_SRB2Loop(void) rendertimefrac_unpaused = FRACUNIT; } - if ((interp || doDisplay) && !frameskip) + + if (interp || doDisplay) { - ranwipe = D_Display(); + if (!frameskip) + { + ranwipe = D_Display(); + } + else if (frameskip) + { + // always update console and hud + // otherwise it may take minutes to open it + CON_Drawer(); + + if (gamestate == GS_LEVEL) + { + ST_Drawer(); + HU_Drawer(); + } + } } // Only take screenshots after drawing. From e749346f0c550e027ce005e4861945e086ae0d19 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Jul 2025 20:39:50 +0200 Subject: [PATCH 52/80] fix console taking minutes to open during frameskipping prob not the best way to handle this, but its the simplest the console should always be openable without issues unless during wipes, since in some cases you end up having to kill the game to do anything --- src/d_main.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index e7c9c83cc..74a21a5af 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -866,9 +866,25 @@ void D_SRB2Loop(void) rendertimefrac_unpaused = FRACUNIT; } - if ((interp || doDisplay) && !frameskip) + + if (interp || doDisplay) { - ranwipe = D_Display(); + if (!frameskip) + { + ranwipe = D_Display(); + } + else if (frameskip) + { + // always update console and hud + // otherwise it may take minutes to open it + CON_Drawer(); + + if (gamestate == GS_LEVEL) + { + ST_Drawer(); + HU_Drawer(); + } + } } // Only take screenshots after drawing. From 93cbba218aef67ace9eaf26ed8568d718077ebd7 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Jul 2025 22:33:53 +0200 Subject: [PATCH 53/80] add mobj islocal field so we can skip the pushable trigger stuff for local mobjs for synch reasons very sketchy --- src/k_kart.c | 11 ++++++----- src/lua_mobjlib.c | 3 ++- src/p_mobj.c | 2 +- src/p_mobj.h | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 5d152ca17..4733f63ae 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3081,14 +3081,12 @@ static void K_SpawnDriftSparks(player_t *player) if (leveltime % 2 == 1) return; - if (cv_airsparks.value) - goto skipground; + const boolean onground = P_IsObjectOnGround(player->mo); - if (!P_IsObjectOnGround(player->mo)) + // kinda sketchy + if (!cv_airsparks.value && onground) return; -skipground: // idk im sleepy - if (!player->kartstuff[k_drift] || player->kartstuff[k_driftcharge] < K_GetKartDriftSparkValue(player)) return; @@ -3105,6 +3103,8 @@ skipground: // idk im sleepy newy = player->mo->y + P_ReturnThrustY(player->mo, thrustangle, smolscale); spark = P_SpawnMobj(newx, newy, player->mo->z, MT_DRIFTSPARK); + spark->islocal = cv_airsparks.value && !onground; + P_SetTarget(&spark->target, player->mo); spark->angle = travelangle-(ANGLE_45/5)*player->kartstuff[k_drift]; @@ -5361,6 +5361,7 @@ FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, bool fast->momx = 3*player->mo->momx/4; fast->momy = 3*player->mo->momy/4; fast->momz = 3*player->mo->momz/4; + fast->islocal = !synched; P_SetTarget(&fast->target, player->mo); // easier lua access K_MatchGenericExtraFlags(fast, player->mo); diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index 4103bce99..ea936d773 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -150,7 +150,8 @@ static const udata_field_t mobj_fields[] = { FIELD(mobj_t, cvmem, udatalib_getter_int32, udatalib_setter_int32), FIELD(mobj_t, standingslope, udatalib_getter_slope, mobj_standingslope_noset), FIELD(mobj_t, colorized, udatalib_getter_boolean, udatalib_setter_boolean), - FIELD(mobj_t, mirrored, udatalib_getter_boolean, udatalib_setter_boolean), + FIELD(mobj_t, mirrored, udatalib_getter_boolean, udatalib_setter_boolean), + FIELD(mobj_t, islocal, udatalib_getter_boolean, udatalib_setter_boolean), { NULL, 0, NULL, NULL }, }; #undef FIELD diff --git a/src/p_mobj.c b/src/p_mobj.c index 09649d530..8907ba41a 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6089,7 +6089,7 @@ void P_MobjThinker(mobj_t *mobj) const sector_t *sec1 = mobj->subsector ? mobj->subsector->sector : NULL; // 970 allows ANY mobj to trigger a linedef exec - if (UNLIKELY(sec1 && GETSECSPECIAL(sec1->special, 2) == 8)) + if (UNLIKELY(!mobj->islocal && sec1 && GETSECSPECIAL(sec1->special, 2) == 8)) // BEWARE: islocal does not exist in vanilla { sector_t *sec2; sec2 = P_ThingOnSpecial3DFloor(mobj); diff --git a/src/p_mobj.h b/src/p_mobj.h index cd4033157..0967b1dd5 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -414,6 +414,7 @@ typedef struct mobj_s boolean init_salty; // WARNING: New fields must be added separately to savegame and Lua. + boolean islocal; // BEWARE: islocal does not exist in vanilla, strictly to be used for locally loaded addons to not cause desynchs with the mobj linedef trigger check. DO NOT USE THIS IN ACTUAL ADDONS YOU INTEND TO USE ON YOUR SERVER } mobj_t; // From a4810bd6c847a82e824a7c6edbac0ce272cbd04b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Thu, 24 Jul 2025 23:30:09 +0200 Subject: [PATCH 54/80] Fix custom addon directory being ignored when downloading addons --- src/d_netfil.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/d_netfil.c b/src/d_netfil.c index d45570a0e..650433e44 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -1185,6 +1185,18 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet badmd5 = true; // if not found at all, just move on without doing anything + if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0') + { + // next, check any custom directory if specified + homecheck = filesearch(filename, cv_addons_folder.string, wantedmd5sum, completepath, 10); + + if (homecheck == FS_FOUND) // we found the file, so return that we have :) + return FS_FOUND; + else if (homecheck == FS_MD5SUMBAD) // file has a bad md5; move on and look for a file with the right md5 + badmd5 = true; + // if not found at all, just move on without doing anything + } + // finally check "." directory homecheck = filesearch(filename, ".", wantedmd5sum, completepath, 10); From f97941f86e30751a222545c18a1a9cbe6bc4de6d Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Jul 2025 23:47:23 +0200 Subject: [PATCH 55/80] update link in addon menu to "mb.srb2.org/addons" :chonkbuncle: --- src/m_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 04f7bc6ff..debb3c7b5 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6072,8 +6072,8 @@ static void M_AddonsOptions(INT32 choice) M_SetupNextMenu(&OP_AddonsOptionsDef); } -#define LOCATIONSTRING1 "Visit \x83SRB2.ORG/MODS\x80 to get & make addons!" -#define LOCATIONSTRING2 "Visit \x88SRB2.ORG/MODS\x80 to get & make addons!" +#define LOCATIONSTRING1 "Visit \x83mb.srb2.org/addons\x80 to get & make addons!" +#define LOCATIONSTRING2 "Visit \x88mb.srb2.org/addons\x80 to get & make addons!" static void M_AddonsInternal(void) { From 9261d9c5b2d96f612d4c1181dab4a185d286a041 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:12:29 +0200 Subject: [PATCH 56/80] D_CleanFile can be static --- src/d_main.c | 4 +++- src/d_main.h | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 71835c2e3..1140362b3 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -152,6 +152,8 @@ boolean dedicated = false; boolean loaded_config = false; // true once config.cfg loaded AND executed +static void D_CleanFile(char **filearray); + // // D_PostEvent // Called by the I/O functions when input is detected @@ -1231,7 +1233,7 @@ void D_AddPostloadFiles(void) postautoloaded = true; } -void D_CleanFile(char **filearray) +static void D_CleanFile(char **filearray) { size_t pnumwadfiles; for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++) diff --git a/src/d_main.h b/src/d_main.h index 1e2de572d..69bbe3026 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -85,8 +85,6 @@ void D_PostEvent(const event_t *ev); void D_ProcessEvents(void); -void D_CleanFile(char **filearray); - const char *D_Home(void); // From 3e8b3e868b5956bf7c7dd6d156347d0aa57b4553 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:13:19 +0200 Subject: [PATCH 57/80] simplify this --- src/hu_stuff.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 07ebdd26f..59aba1874 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -310,7 +310,7 @@ void HU_LoadGraphics(void) lt_font[0] = (patch_t *)W_CachePatchName("LTFNT039", PU_HUDGFX); /// \note fake start hack // Number support - lt_font[9] = (patch_t *)W_CachePatchName("LTFNT048", PU_HUDGFX); + lt_font[9] = (patch_t *)W_CachePatchName("LTFNT048", PU_HUDGFX); lt_font[10] = (patch_t *)W_CachePatchName("LTFNT049", PU_HUDGFX); lt_font[11] = (patch_t *)W_CachePatchName("LTFNT050", PU_HUDGFX); lt_font[12] = (patch_t *)W_CachePatchName("LTFNT051", PU_HUDGFX); @@ -747,7 +747,7 @@ static void Command_CSay_f(void) return; } - if(!server && !IsPlayerAdmin(consoleplayer)) + if (!server && !IsPlayerAdmin(consoleplayer)) { CONS_Alert(CONS_NOTICE, M_GetText("Only servers and admins can use csay.\n")); return; @@ -2881,13 +2881,11 @@ void HU_DoCEcho(const char *msg) *p = '\n'; CONS_Printf("%s\n", temp); + return; } + else if (cv_cechotoggle.value) + cechotimer = cechoduration; - I_OutputMsg("%s\n", msg); // print to log - - if (!cv_cechotoggle.value) - return; - - cechotimer = cechoduration; + I_OutputMsg("%s\n", msg); // ALWAYS print to log } From 306fec6f9eb29ddf66d7350e2ef84261719dc546 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:14:04 +0200 Subject: [PATCH 58/80] get rid of code dupe for fpscapping stuff --- src/r_fps.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/src/r_fps.c b/src/r_fps.c index 0c3a58737..f5d02dda1 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -42,13 +42,13 @@ static CV_PossibleValue_t fpscap_cons_t[] = { {0, NULL} }; -consvar_t cv_fpscap = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_fpscap = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_fpscapbg = {"fpscapbackground", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_precipinterp = {"precipinterpolation", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; ps_metric_t ps_interp_frac = {0}; -ps_metric_t ps_interp_lag = {0}; +ps_metric_t ps_interp_lag = {0}; static boolean R_UseBackgroundFramerateCap(void) { @@ -67,21 +67,21 @@ static boolean R_UseBackgroundFramerateCap(void) return false; } -static UINT32 R_GetBackgroundFramerateCap(void) +static UINT32 R_GetFrameCap(INT32 val) { - if (cv_fpscapbg.value == 0) + if (val == 0) { // 0: Match refresh rate return I_GetRefreshRate(); } - if (cv_fpscapbg.value < 0) + if (val < 0) { // -1: Unlimited return 0; } - return cv_fpscapbg.value; + return val; } UINT32 R_GetFramerateCap(void) @@ -95,22 +95,10 @@ UINT32 R_GetFramerateCap(void) if (R_UseBackgroundFramerateCap()) { - return R_GetBackgroundFramerateCap(); + return R_GetFrameCap(cv_fpscapbg.value); } - if (cv_fpscap.value == 0) - { - // 0: Match refresh rate - return I_GetRefreshRate(); - } - - if (cv_fpscap.value < 0) - { - // -1: Unlimited - return 0; - } - - return cv_fpscap.value; + return R_GetFrameCap(cv_fpscap.value); } boolean R_UsingFrameInterpolation(void) From 9859e43be775ac2479a61991fc11213bcb1b34d1 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:15:27 +0200 Subject: [PATCH 59/80] get rid of some redundancy R_Frame stuff R_SetupCommonFrame already checks the actual sector for us, so we dont need to do this before --- src/r_main.cpp | 66 ++++++++++++++++++++++++++------------------------ src/r_main.h | 4 +-- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/r_main.cpp b/src/r_main.cpp index cef57ad2e..155711a36 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -1133,7 +1133,6 @@ static void R_SetupSkyScale(player_t *player, camera_t *thiscam, mapheader_t *mh { if (skyboxmo[1]) { - angle_t ang; fixed_t x = 0, y = 0; if (mh->skybox_scalex > 0) @@ -1165,8 +1164,8 @@ static void R_SetupSkyScale(player_t *player, camera_t *thiscam, mapheader_t *mh newview->y -= x; break; default: - ang = viewmobj->angle>>ANGLETOFINESHIFT; - newview->x += FixedMul(x,FINECOSINE(ang)) - FixedMul(y, FINESINE(ang)); + angle_t ang = viewmobj->angle>>ANGLETOFINESHIFT; + newview->x += FixedMul(x,FINECOSINE(ang)) - FixedMul(y, FINESINE(ang)); newview->y += FixedMul(x, FINESINE(ang)) + FixedMul(y,FINECOSINE(ang)); break; } @@ -1192,14 +1191,14 @@ static void R_SetupSkyScale(player_t *player, camera_t *thiscam, mapheader_t *mh } } -void R_SkyboxFrame(int s) +void R_SkyboxFrame(UINT8 pnum) { - player_t *player = &players[displayplayers[s]]; - camera_t *thiscam = &camera[s]; - subsector_t *subsector = NULL; + player_t *player = &players[displayplayers[pnum]]; + camera_t *thiscam = &camera[pnum]; + sector_t *viewsec = NULL; mapheader_t *mh = mapheaderinfo[gamemap-1]; - R_SetViewContext(static_cast(VIEWCONTEXT_SKY1 + s)); + R_SetViewContext(static_cast(VIEWCONTEXT_SKY1 + pnum)); // cut-away view stuff newview->sky = true; @@ -1215,35 +1214,38 @@ void R_SkyboxFrame(int s) R_SetupAimingFrame(player, thiscam); - newview->angle += viewmobj->angle; + if (!P_MobjWasRemoved(viewmobj)) + { + newview->angle += viewmobj->angle; - newview->x = viewmobj->x; - newview->y = viewmobj->y; - newview->z = (viewmobj->spawnpoint) ? (((fixed_t)viewmobj->spawnpoint->angle)<x = viewmobj->x; + newview->y = viewmobj->y; + newview->z = (viewmobj->spawnpoint) ? (((fixed_t)viewmobj->spawnpoint->angle) << FRACBITS) : 0; + + if (viewmobj->subsector) + viewsec = viewmobj->subsector->sector; + } if (mh) { R_SetupSkyScale(player, thiscam, mh); } - if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && viewmobj->subsector->sector) - subsector = viewmobj->subsector; - - R_SetupCommonFrame(player, subsector->sector); + R_SetupCommonFrame(player, viewsec); } -void R_SetupFrame(int s, boolean skybox) +void R_SetupFrame(UINT8 pnum, boolean skybox) { - player_t *player = &players[displayplayers[s]]; - camera_t *thiscam = &camera[s]; - boolean chasecam = (cv_chasecam[s].value); - sector_t * sector = NULL; + player_t *player = &players[displayplayers[pnum]]; + camera_t *thiscam = &camera[pnum]; + boolean chasecam = (cv_chasecam[pnum].value); + sector_t *viewsec = NULL; - R_SetViewContext(static_cast(VIEWCONTEXT_PLAYER1 + s)); + R_SetViewContext(static_cast(VIEWCONTEXT_PLAYER1 + pnum)); if (thiscam->reset) { - R_ResetViewInterpolation(s); + R_ResetViewInterpolation(pnum); thiscam->reset = false; } @@ -1278,10 +1280,10 @@ void R_SetupFrame(int s, boolean skybox) newview->y = viewmobj->y; newview->z = viewmobj->z + 20*FRACUNIT; - if (viewmobj->subsector && viewmobj->subsector->sector) - sector = viewmobj->subsector->sector; + if (viewmobj->subsector) + viewsec = viewmobj->subsector->sector; - R_SetupCommonFrame(player, sector); + R_SetupCommonFrame(player, viewsec); } else if (thiscam && chasecam) // use outside cam view { @@ -1292,10 +1294,10 @@ void R_SetupFrame(int s, boolean skybox) newview->y = thiscam->y; newview->z = thiscam->z + (thiscam->height>>1); - if (thiscam->subsector && thiscam->subsector->sector) - sector = thiscam->subsector->sector; + if (thiscam->subsector) + viewsec = thiscam->subsector->sector; - R_SetupCommonFrame(player, sector); + R_SetupCommonFrame(player, viewsec); } else if (player->mo) // use the player's eyes view { @@ -1306,10 +1308,10 @@ void R_SetupFrame(int s, boolean skybox) newview->y = viewmobj->y; newview->z = player->viewz; - if (viewmobj->subsector && viewmobj->subsector->sector) - sector = viewmobj->subsector->sector; + if (viewmobj->subsector) + viewsec = viewmobj->subsector->sector; - R_SetupCommonFrame(player, sector); + R_SetupCommonFrame(player, viewsec); } } diff --git a/src/r_main.h b/src/r_main.h index 295e6e34d..82a0205d3 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -215,8 +215,8 @@ void R_SetViewSize(void); void R_ExecuteSetViewSize(void); fixed_t R_GetPlayerFov(player_t *player); -void R_SkyboxFrame(int s); -void R_SetupFrame(int s, boolean skybox); +void R_SkyboxFrame(UINT8 pnum); +void R_SetupFrame(UINT8 pnum, boolean skybox); // Called by G_Drawer. void R_RenderPlayerView(player_t *player); From d91fbf5d367f1fc377a17040c5276c051fc57119 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:16:31 +0200 Subject: [PATCH 60/80] move assignments after early returns ST_drawLevelTitle --- src/st_stuff.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index 16a45ea59..d429cf719 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -419,27 +419,28 @@ static void ST_drawDebugInfo(void) static void ST_drawLevelTitle(void) { - char *lvlttl = mapheaderinfo[gamemap-1]->lvlttl; - char *subttl = mapheaderinfo[gamemap-1]->subttl; - char *zonttl = mapheaderinfo[gamemap-1]->zonttl; // SRB2kart - char *actnum = mapheaderinfo[gamemap-1]->actnum; - INT32 lvlttlxpos; - INT32 ttlnumxpos; - INT32 zonexpos; - INT32 dupcalc = (vid.width/vid.dupx); - UINT8 gtc = G_GetGametypeColor(gametype); + char *lvlttl, *subttl, *zonttl, *actnum; + INT32 lvlttlxpos, ttlnumxpos, zonexpos; + INT32 dupcalc; + UINT8 gtc; INT32 sub = 0; - INT32 bary = (splitscreen) - ? BASEVIDHEIGHT/2 - : 163; + INT32 bary; INT32 lvlw; - if (!cv_stagetitle.value) + if (!cv_stagetitle.value || (timeinmap > 113)) return; - if (timeinmap > 113) + if (*mapheaderinfo[gamemap-1]->lvlttl == '\0') return; + lvlttl = mapheaderinfo[gamemap-1]->lvlttl; + subttl = mapheaderinfo[gamemap-1]->subttl; + zonttl = mapheaderinfo[gamemap-1]->zonttl; // SRB2kart + actnum = mapheaderinfo[gamemap-1]->actnum; + dupcalc = (vid.width/vid.dupx); + gtc = G_GetGametypeColor(gametype); + bary = (splitscreen) ? BASEVIDHEIGHT/2 : 163; + lvlw = V_LevelNameWidth(lvlttl); if (actnum[0]) @@ -603,7 +604,7 @@ static void ST_overlayDrawer(void) } // draw level title Tails - if (*mapheaderinfo[gamemap-1]->lvlttl != '\0' && !(hu_showscores && (netgame || multiplayer) && !mapreset) && LUA_HudEnabled(hud_stagetitle) && !forceshowhud) + if (!(hu_showscores && (netgame || multiplayer) && !mapreset) && LUA_HudEnabled(hud_stagetitle) && !forceshowhud) ST_drawLevelTitle(); if (!hu_showscores && netgame && !mapreset) From cb2e017bcf3d78efaf8d09b9f179ae315ac9926e Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:16:51 +0200 Subject: [PATCH 61/80] seenames stuff is always unlikely --- src/st_stuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index d429cf719..0ca8c562c 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -741,7 +741,7 @@ void ST_Drawer(void) UINT8 i; #ifdef SEENAMES - if (cv_seenames.value && cv_allowseenames.value && displayplayers[0] == consoleplayer && seenplayer && seenplayer->mo && !mapreset) + if (UNLIKELY(cv_seenames.value && cv_allowseenames.value && displayplayers[0] == consoleplayer && seenplayer && seenplayer->mo && !mapreset)) { if (cv_seenames.value == 1) V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2 + 15, V_HUDTRANSHALF, player_names[seenplayer-players]); From d9c7a40d4a6af003bbe3912e8389e92e4c2e13bb Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Sat, 26 Jul 2025 11:58:55 -0500 Subject: [PATCH 62/80] Borderless window toggle --- src/sdl/i_video.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index f4a2c288c..e357d98e8 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -134,9 +134,12 @@ static INT32 desktopwidth = 0, desktopheight = 0; static void I_CheckDesktopRes(void); +static void VID_SetBorderless(void); + // synchronize page flipping with screen refresh consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Impl_SetVsync, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +static consvar_t cv_borderless = {"borderless", "Off", CV_SAVE|CV_CALL, CV_OnOff, VID_SetBorderless, 0, NULL, NULL, 0, 0, NULL}; static void mousegrabOnChange(void); consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE|CV_CALL, CV_OnOff, mousegrabOnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -1353,6 +1356,7 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) { wasfullscreen = SDL_TRUE; SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP); + VID_SetBorderless(); } else // windowed mode { @@ -1877,6 +1881,7 @@ void I_StartupGraphics(void) CV_RegisterVar (&cv_vidwait); CV_RegisterVar (&cv_stretch); CV_RegisterVar (&cv_alwaysgrabmouse); + CV_RegisterVar (&cv_borderless); disable_mouse = M_CheckParm("-nomouse"); disable_fullscreen = M_CheckParm("-win") ? 1 : 0; @@ -2157,4 +2162,10 @@ static void Impl_SetVsync(void) #endif } +static void VID_SetBorderless(void) +{ + SDL_bool borderless = (cv_borderless.value) ? SDL_FALSE : SDL_TRUE; + SDL_SetWindowBordered(window, borderless); +} + #endif From 2052afdb66971140de13099ac8d1aab257909437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Thu, 24 Jul 2025 23:30:09 +0200 Subject: [PATCH 63/80] Fix custom addon directory being ignored when downloading addons --- src/d_netfil.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/d_netfil.c b/src/d_netfil.c index 0650f3c34..b7214f0c4 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -1183,6 +1183,18 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet badmd5 = true; // if not found at all, just move on without doing anything + if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0') + { + // next, check any custom directory if specified + homecheck = filesearch(filename, cv_addons_folder.string, wantedmd5sum, completepath, 10); + + if (homecheck == FS_FOUND) // we found the file, so return that we have :) + return FS_FOUND; + else if (homecheck == FS_MD5SUMBAD) // file has a bad md5; move on and look for a file with the right md5 + badmd5 = true; + // if not found at all, just move on without doing anything + } + // finally check "." directory homecheck = filesearch(filename, ".", wantedmd5sum, completepath, 10); From b23906e327b57dfd681bbda4b2a4198d5407fd18 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 24 Jul 2025 23:47:23 +0200 Subject: [PATCH 64/80] update link in addon menu to "mb.srb2.org/addons" :chonkbuncle: --- src/m_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 256e45b82..eda6af9cc 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6074,8 +6074,8 @@ static void M_AddonsOptions(INT32 choice) M_SetupNextMenu(&OP_AddonsOptionsDef); } -#define LOCATIONSTRING1 "Visit \x83SRB2.ORG/MODS\x80 to get & make addons!" -#define LOCATIONSTRING2 "Visit \x88SRB2.ORG/MODS\x80 to get & make addons!" +#define LOCATIONSTRING1 "Visit \x83mb.srb2.org/addons\x80 to get & make addons!" +#define LOCATIONSTRING2 "Visit \x88mb.srb2.org/addons\x80 to get & make addons!" static void M_AddonsInternal(void) { From 805cde8ae844ca442208a8825dd92e6134a68d80 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:12:29 +0200 Subject: [PATCH 65/80] D_CleanFile can be static --- src/d_main.c | 4 +++- src/d_main.h | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 74a21a5af..ba5cc4fa5 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -149,6 +149,8 @@ boolean dedicated = false; boolean loaded_config = false; // true once config.cfg loaded AND executed +static void D_CleanFile(char **filearray); + // // D_PostEvent // Called by the I/O functions when input is detected @@ -1201,7 +1203,7 @@ void D_AddPostloadFiles(void) postautoloaded = true; } -void D_CleanFile(char **filearray) +static void D_CleanFile(char **filearray) { size_t pnumwadfiles; for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++) diff --git a/src/d_main.h b/src/d_main.h index cb4049e54..2b2719f2e 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -81,8 +81,6 @@ void D_PostEvent(const event_t *ev); void D_ProcessEvents(void); -void D_CleanFile(char **filearray); - const char *D_Home(void); // From f8d903e7d296faf3aac3cee01d0862f2a7ffcbba Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:13:19 +0200 Subject: [PATCH 66/80] simplify this --- src/hu_stuff.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 2821c4021..7c4109ee2 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -311,7 +311,7 @@ void HU_LoadGraphics(void) lt_font[0] = (patch_t *)W_CachePatchName("LTFNT039", PU_HUDGFX); /// \note fake start hack // Number support - lt_font[9] = (patch_t *)W_CachePatchName("LTFNT048", PU_HUDGFX); + lt_font[9] = (patch_t *)W_CachePatchName("LTFNT048", PU_HUDGFX); lt_font[10] = (patch_t *)W_CachePatchName("LTFNT049", PU_HUDGFX); lt_font[11] = (patch_t *)W_CachePatchName("LTFNT050", PU_HUDGFX); lt_font[12] = (patch_t *)W_CachePatchName("LTFNT051", PU_HUDGFX); @@ -748,7 +748,7 @@ static void Command_CSay_f(void) return; } - if(!server && !IsPlayerAdmin(consoleplayer)) + if (!server && !IsPlayerAdmin(consoleplayer)) { CONS_Alert(CONS_NOTICE, M_GetText("Only servers and admins can use csay.\n")); return; @@ -2789,13 +2789,11 @@ void HU_DoCEcho(const char *msg) *p = '\n'; CONS_Printf("%s\n", temp); + return; } + else if (cv_cechotoggle.value) + cechotimer = cechoduration; - I_OutputMsg("%s\n", msg); // print to log - - if (!cv_cechotoggle.value) - return; - - cechotimer = cechoduration; + I_OutputMsg("%s\n", msg); // ALWAYS print to log } From 2259d4f309950bb20191f1166fce19d2005621fa Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:14:04 +0200 Subject: [PATCH 67/80] get rid of code dupe for fpscapping stuff --- src/r_fps.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/src/r_fps.c b/src/r_fps.c index 4938988dc..3cfe19000 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -42,13 +42,13 @@ static CV_PossibleValue_t fpscap_cons_t[] = { {0, NULL} }; -consvar_t cv_fpscap = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_fpscap = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_fpscapbg = {"fpscapbackground", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_precipinterp = {"precipinterpolation", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; ps_metric_t ps_interp_frac = {0}; -ps_metric_t ps_interp_lag = {0}; +ps_metric_t ps_interp_lag = {0}; static boolean R_UseBackgroundFramerateCap(void) { @@ -67,21 +67,21 @@ static boolean R_UseBackgroundFramerateCap(void) return false; } -static UINT32 R_GetBackgroundFramerateCap(void) +static UINT32 R_GetFrameCap(INT32 val) { - if (cv_fpscapbg.value == 0) + if (val == 0) { // 0: Match refresh rate return I_GetRefreshRate(); } - if (cv_fpscapbg.value < 0) + if (val < 0) { // -1: Unlimited return 0; } - return cv_fpscapbg.value; + return val; } UINT32 R_GetFramerateCap(void) @@ -95,22 +95,10 @@ UINT32 R_GetFramerateCap(void) if (R_UseBackgroundFramerateCap()) { - return R_GetBackgroundFramerateCap(); + return R_GetFrameCap(cv_fpscapbg.value); } - if (cv_fpscap.value == 0) - { - // 0: Match refresh rate - return I_GetRefreshRate(); - } - - if (cv_fpscap.value < 0) - { - // -1: Unlimited - return 0; - } - - return cv_fpscap.value; + return R_GetFrameCap(cv_fpscap.value); } boolean R_UsingFrameInterpolation(void) From 67cc5402cf166e361a806e9b1c7468a223099268 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:16:31 +0200 Subject: [PATCH 68/80] move assignments after early returns ST_drawLevelTitle --- src/st_stuff.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index 4f5401aae..3b9cc09a7 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -418,27 +418,28 @@ static void ST_drawDebugInfo(void) static void ST_drawLevelTitle(void) { - char *lvlttl = mapheaderinfo[gamemap-1]->lvlttl; - char *subttl = mapheaderinfo[gamemap-1]->subttl; - char *zonttl = mapheaderinfo[gamemap-1]->zonttl; // SRB2kart - char *actnum = mapheaderinfo[gamemap-1]->actnum; - INT32 lvlttlxpos; - INT32 ttlnumxpos; - INT32 zonexpos; - INT32 dupcalc = (vid.width/vid.dupx); - UINT8 gtc = G_GetGametypeColor(gametype); + char *lvlttl, *subttl, *zonttl, *actnum; + INT32 lvlttlxpos, ttlnumxpos, zonexpos; + INT32 dupcalc; + UINT8 gtc; INT32 sub = 0; - INT32 bary = (splitscreen) - ? BASEVIDHEIGHT/2 - : 163; + INT32 bary; INT32 lvlw; - if (!cv_stagetitle.value) + if (!cv_stagetitle.value || (timeinmap > 113)) return; - if (timeinmap > 113) + if (*mapheaderinfo[gamemap-1]->lvlttl == '\0') return; + lvlttl = mapheaderinfo[gamemap-1]->lvlttl; + subttl = mapheaderinfo[gamemap-1]->subttl; + zonttl = mapheaderinfo[gamemap-1]->zonttl; // SRB2kart + actnum = mapheaderinfo[gamemap-1]->actnum; + dupcalc = (vid.width/vid.dupx); + gtc = G_GetGametypeColor(gametype); + bary = (splitscreen) ? BASEVIDHEIGHT/2 : 163; + lvlw = V_LevelNameWidth(lvlttl); if (actnum[0]) @@ -602,7 +603,7 @@ static void ST_overlayDrawer(void) } // draw level title Tails - if (*mapheaderinfo[gamemap-1]->lvlttl != '\0' && !(hu_showscores && (netgame || multiplayer) && !mapreset) && LUA_HudEnabled(hud_stagetitle) && !forceshowhud) + if (!(hu_showscores && (netgame || multiplayer) && !mapreset) && LUA_HudEnabled(hud_stagetitle) && !forceshowhud) ST_drawLevelTitle(); if (!hu_showscores && netgame && !mapreset) From 50f7e2084c5cd2474a8b624222830528ea0b2572 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 26 Jul 2025 16:16:51 +0200 Subject: [PATCH 69/80] seenames stuff is always unlikely --- src/st_stuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index 3b9cc09a7..7391e919f 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -740,7 +740,7 @@ void ST_Drawer(void) UINT8 i; #ifdef SEENAMES - if (cv_seenames.value && cv_allowseenames.value && displayplayers[0] == consoleplayer && seenplayer && seenplayer->mo && !mapreset) + if (UNLIKELY(cv_seenames.value && cv_allowseenames.value && displayplayers[0] == consoleplayer && seenplayer && seenplayer->mo && !mapreset)) { if (cv_seenames.value == 1) V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2 + 15, V_HUDTRANSHALF, player_names[seenplayer-players]); From fae50c0e19c539517860af8d6aa6f81118df6814 Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Sat, 26 Jul 2025 15:18:03 -0500 Subject: [PATCH 70/80] Make it a part of fullscreen cvar --- src/dedicated/i_video.c | 5 +++++ src/i_video.h | 2 ++ src/screen.c | 6 +++++- src/sdl/i_video.c | 12 ++++-------- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/dedicated/i_video.c b/src/dedicated/i_video.c index 6c0b6644a..8f8781e9e 100644 --- a/src/dedicated/i_video.c +++ b/src/dedicated/i_video.c @@ -152,3 +152,8 @@ boolean I_UseNativeKeyboard(void) { return false; } + +void I_SetBorderlessWindow(void) +{ + +} diff --git a/src/i_video.h b/src/i_video.h index 68042a654..88d295ed9 100644 --- a/src/i_video.h +++ b/src/i_video.h @@ -145,6 +145,8 @@ boolean I_UseNativeKeyboard(void); boolean I_CheckNativeRes(void); +void I_SetBorderlessWindow(void); + #ifdef USE_FBO_OGL void RefreshOGLSDLSurface(void); diff --git a/src/screen.c b/src/screen.c index eb6c2bc82..a8a3ca78b 100644 --- a/src/screen.c +++ b/src/screen.c @@ -66,7 +66,9 @@ static void Highreshudscale_OnChange(void) static void SCR_ChangeFullscreen (void); -consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t fullscreen_cons_t[] = {{0, "No"}, {1, "Yes"}, {2, "Borderless Window"}, {0, NULL}}; + +consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, fullscreen_cons_t, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t accuratefps_cons_t[] = {{0, "Inaccurate"}, {1, "Accurate"}, {0, NULL}}; consvar_t cv_accuratefps = {"fpssampling", "1", CV_SAVE, accuratefps_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -325,6 +327,8 @@ void SCR_SetDefaultMode(void) void SCR_ChangeFullscreen(void) { #ifdef DIRECTFULLSCREEN + I_SetBorderlessWindow(); // Running this here so we can have borderless window at startup + // allow_fullscreen is set by VID_PrepareModeList // it is used to prevent switching to fullscreen during startup if (!allow_fullscreen) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index e357d98e8..fa55e62f1 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -134,12 +134,9 @@ static INT32 desktopwidth = 0, desktopheight = 0; static void I_CheckDesktopRes(void); -static void VID_SetBorderless(void); - // synchronize page flipping with screen refresh consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Impl_SetVsync, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -static consvar_t cv_borderless = {"borderless", "Off", CV_SAVE|CV_CALL, CV_OnOff, VID_SetBorderless, 0, NULL, NULL, 0, 0, NULL}; static void mousegrabOnChange(void); consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE|CV_CALL, CV_OnOff, mousegrabOnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -153,7 +150,7 @@ UINT8 graphics_started = 0; // Is used in console.c and screen.c // To disable fullscreen at startup; is set in VID_PrepareModeList boolean allow_fullscreen = false; static SDL_bool disable_fullscreen = SDL_FALSE; -#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)?0:cv_fullscreen.value +#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)? 0: (cv_fullscreen.value == 1) static SDL_bool disable_mouse = SDL_FALSE; #define USE_MOUSEINPUT (!disable_mouse && cv_usemouse.value && havefocus) #define MOUSE_MENU false //(!disable_mouse && cv_usemouse.value && menuactive && !USE_FULLSCREEN) @@ -1356,7 +1353,7 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) { wasfullscreen = SDL_TRUE; SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP); - VID_SetBorderless(); + I_SetBorderlessWindow(); } else // windowed mode { @@ -1881,7 +1878,6 @@ void I_StartupGraphics(void) CV_RegisterVar (&cv_vidwait); CV_RegisterVar (&cv_stretch); CV_RegisterVar (&cv_alwaysgrabmouse); - CV_RegisterVar (&cv_borderless); disable_mouse = M_CheckParm("-nomouse"); disable_fullscreen = M_CheckParm("-win") ? 1 : 0; @@ -2162,9 +2158,9 @@ static void Impl_SetVsync(void) #endif } -static void VID_SetBorderless(void) +void I_SetBorderlessWindow(void) { - SDL_bool borderless = (cv_borderless.value) ? SDL_FALSE : SDL_TRUE; + SDL_bool borderless = (cv_fullscreen.value == 2) ? SDL_FALSE : SDL_TRUE; SDL_SetWindowBordered(window, borderless); } From 6ef1f73d4dbfa2b81f7c8dcecb53909b231ddd24 Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 27 Jul 2025 13:54:27 +0300 Subject: [PATCH 71/80] Init displayplayers to {0} --- src/g_game.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_game.c b/src/g_game.c index 83be4ecf4..76b076bba 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -109,7 +109,7 @@ boolean addedtogame; player_t players[MAXPLAYERS]; INT32 consoleplayer; // player taking events and displaying -INT32 displayplayers[MAXSPLITSCREENPLAYERS]; // view being displayed +INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {0}; // view being displayed tic_t gametic; tic_t levelstarttic; // gametic at level start From 3f599d5a281dc6a3e26f49b76536fd50a033fbe1 Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 27 Jul 2025 14:03:35 +0300 Subject: [PATCH 72/80] Fix smol typo :3 --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 4733f63ae..f9b7f6afb 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3084,7 +3084,7 @@ static void K_SpawnDriftSparks(player_t *player) const boolean onground = P_IsObjectOnGround(player->mo); // kinda sketchy - if (!cv_airsparks.value && onground) + if (!cv_airsparks.value && !onground) return; if (!player->kartstuff[k_drift] || player->kartstuff[k_driftcharge] < K_GetKartDriftSparkValue(player)) From 2e914c61d1659a391eef56a0a532959d080f0bb4 Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 27 Jul 2025 13:54:27 +0300 Subject: [PATCH 73/80] Init displayplayers to {0} --- src/g_game.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_game.c b/src/g_game.c index 9ace22538..5e2abd02c 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -124,7 +124,7 @@ boolean addedtogame; player_t players[MAXPLAYERS]; INT32 consoleplayer; // player taking events and displaying -INT32 displayplayers[MAXSPLITSCREENPLAYERS]; // view being displayed +INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {0}; // view being displayed tic_t gametic; tic_t levelstarttic; // gametic at level start From 0f087d13bba436cf0c29959de1a4b56a99de6cb2 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 27 Jul 2025 14:18:30 +0200 Subject: [PATCH 74/80] dont do this in dedi dont need to, its pointless and prob causes more issues than anything --- src/d_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 1140362b3..4dc4b6896 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -898,14 +898,13 @@ void D_SRB2Loop(void) rendertimefrac_unpaused = FRACUNIT; } - if (interp || doDisplay) { if (!frameskip) { ranwipe = D_Display(); } - else if (frameskip) + else if (!dedicated) { // always update console and hud // otherwise it may take minutes to open it From 2abf0b98ac643b3d29bc4d1899a43ccf4e384e2f Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 27 Jul 2025 14:18:30 +0200 Subject: [PATCH 75/80] dont do this in dedi dont need to, its pointless and prob causes more issues than anything --- src/d_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index ba5cc4fa5..6bf34ca71 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -868,14 +868,13 @@ void D_SRB2Loop(void) rendertimefrac_unpaused = FRACUNIT; } - if (interp || doDisplay) { if (!frameskip) { ranwipe = D_Display(); } - else if (frameskip) + else if (!dedicated) { // always update console and hud // otherwise it may take minutes to open it From e25d3667286fc146ccfa06cca36963209178463a Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 27 Jul 2025 14:51:10 +0200 Subject: [PATCH 76/80] add toggable player close to camera fade similar to some other kartracers only takes other players into account --- src/hardware/hw_main.c | 4 ++++ src/hardware/hw_md2.c | 6 +++++- src/r_main.c | 14 ++++++++------ src/r_main.h | 1 + src/r_things.c | 34 ++++++++++++++++++++++++++++++++++ src/r_things.h | 2 ++ 6 files changed, 54 insertions(+), 7 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 8883de69a..72249b5a9 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -3707,6 +3707,8 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude; } + Surf.PolyColor.s.alpha = FixedMul(R_GetThingFade(spr->mobj), Surf.PolyColor.s.alpha); + if (HWR_UseShader()) { shader = SHADER_SPRITE; @@ -3994,6 +3996,8 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude; } + Surf.PolyColor.s.alpha = FixedMul(R_GetThingFade(spr->mobj), Surf.PolyColor.s.alpha); + if (HWR_UseShader()) { shader = SHADER_SPRITE; diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 2696cf89d..6446a0790 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1227,6 +1227,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr) Surf.PolyFlags = HWR_GetBlendModeFlag(blendmode); } + Surf.PolyColor.s.alpha = FixedMul(R_GetThingFade(spr->mobj), Surf.PolyColor.s.alpha); + // dont forget to enabled the depth test because we can't do this like // before: polygons models are not sorted @@ -1241,7 +1243,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) else { md2s = md2_playermodels; - skinnum = (skin_t *)spr->mobj->localskin - skins; + skinnum = (skin_t *)spr->mobj->localskin - skins; } } else @@ -1266,6 +1268,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) if (md2->error) return; // we already failed loading this before :( + if (!md2->model) { CONS_Debug(DBG_RENDER, "Loading model... (%s, %s)", sprnames[spr->mobj->sprite], md2->filename); @@ -1284,6 +1287,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) return; } } + //Hurdler: arf, I don't like that implementation at all... too much crappy gpatch = md2->glpatch; if (gpatch) diff --git a/src/r_main.c b/src/r_main.c index 3e898a749..7b58679ee 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -138,10 +138,10 @@ static CV_PossibleValue_t drawdist_precip_cons_t[] = { #endif static CV_PossibleValue_t maxinterpdist_cons_t[] = { - /*{256, "256"},*/ {512, "512"}, {768, "768"}, - {1024, "1024"}, {1536, "1536"}, {2048, "2048"}, - {3072, "3072"}, {4096, "4096"}, {6144, "6144"}, - {8192, "8192"}, {0, "Infinite"}, {0, NULL}}; + /*{256, "256"},*/ {512, "512"}, {768, "768"}, + {1024, "1024"}, {1536, "1536"}, {2048, "2048"}, + {3072, "3072"}, {4096, "4096"}, {6144, "6144"}, + {8192, "8192"}, {0, "Infinite"}, {0, NULL}}; static CV_PossibleValue_t fov_cons_t[] = {{MINFOV*FRACUNIT, "MIN"}, {MAXFOV*FRACUNIT, "MAX"}, {0, NULL}}; @@ -171,14 +171,14 @@ consvar_t cv_tailspickup = {"tailspickup", "On", CV_NETVAR|CV_NOSHOWHELP, CV_OnO consvar_t cv_precachetextures = {"precachetextures", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_chasecam[MAXSPLITSCREENPLAYERS] = { - {"chasecam", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, + {"chasecam", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, {"chasecam2", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, {"chasecam3", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, {"chasecam4", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL} }; consvar_t cv_flipcam[MAXSPLITSCREENPLAYERS] = { - {"flipcam", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange, 0, NULL, NULL, 0, 0, NULL}, + {"flipcam", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam2_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"flipcam3", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam3_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"flipcam4", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam4_OnChange, 0, NULL, NULL, 0, 0, NULL} @@ -200,6 +200,7 @@ consvar_t cv_drawdist = {"drawdist", "Infinite", CV_SAVE, drawdist_cons_t, NULL, consvar_t cv_drawdist_precip = {"drawdist_precip", "1024", CV_SAVE|CV_CALL|CV_NOINIT, drawdist_precip_cons_t, Precipstuff_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_lessprecip = {"lessweathereffects", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Precipstuff_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_mobjscaleprecip = {"scaleprecipmobjscale", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Precipstuff_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_playerfade = {"playerfade", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_maxinterpdist = {"maxinterpdist", "Infinite", CV_SAVE, maxinterpdist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -1569,6 +1570,7 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_randomdirlight); CV_RegisterVar(&cv_maxinterpdist); + CV_RegisterVar(&cv_playerfade); CV_RegisterVar(&cv_ripplewater); diff --git a/src/r_main.h b/src/r_main.h index d3284764d..9dca1e3fe 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -213,6 +213,7 @@ extern consvar_t cv_fov, cv_fovchange; extern consvar_t cv_skybox; extern consvar_t cv_tailspickup; extern consvar_t cv_maxinterpdist; +extern consvar_t cv_playerfade; extern consvar_t cv_ripplewater; extern consvar_t cv_randomdirlight; diff --git a/src/r_things.c b/src/r_things.c index 538e34b74..553e5d4d5 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -716,6 +716,13 @@ static void R_DrawFlippedMaskedColumn(column_t *column) dc_texturemid = basetexturemid; } + +// Based off of R_GetLinedefTransTable +transnum_t R_GetThingTransTable(fixed_t alpha, transnum_t transmap) +{ + return (20*(FRACUNIT - ((alpha * (10 - transmap))/10) - 1) + FRACUNIT) >> (FRACBITS+1); +} + // // R_DrawVisSprite // mfloorclip and mceilingclip should also be set. @@ -1579,6 +1586,8 @@ static void R_ProjectSprite(mobj_t *thing) else trans = 0; + trans = R_GetThingTransTable(R_GetThingFade(oldthing), trans); + //SoM: 3/17/2000: Disregard sprites that are out of view.. if (vflip) { @@ -2888,6 +2897,31 @@ boolean R_ThingWithinDist(mobj_t *thing, INT32 limit_dist) return true; } +fixed_t R_GetThingFade(mobj_t *thing) +{ + fixed_t fadealpha = FRACUNIT; + + if (!cv_playerfade.value || leveltime < starttime-(3*TICRATE) || !thing->player || thing->player == viewplayer) + return fadealpha; + + const INT32 playerdist = (FixedMul((thing->x - viewx), viewcos) + FixedMul((thing->y - viewy), viewsin)) >> FRACBITS; + const INT32 viewplayerdist = (FixedMul((viewplayer->mo->x - viewx), viewcos) + FixedMul((viewplayer->mo->y - viewy), viewsin)) >> FRACBITS; + + if (playerdist < viewplayerdist) + { + if (playerdist < viewplayerdist / 2) // stronger fade when very close + { + fadealpha = (playerdist * FRACUNIT) / (viewplayerdist / 2) / 3; + } + else + { + fadealpha = (playerdist * FRACUNIT) / viewplayerdist; + } + } + + return fadealpha; +} + boolean R_ThingIsFullBright(mobj_t *thing) { return ((thing->frame & FF_BRIGHTMASK) == FF_FULLBRIGHT); diff --git a/src/r_things.h b/src/r_things.h index fe4f532b6..6e3c95d67 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -76,6 +76,8 @@ void R_InitSprites(void); void R_ClearSprites(void); void R_DrawMasked(void); +fixed_t R_GetThingFade(mobj_t *thing); + boolean R_ThingVisible (mobj_t *thing); boolean R_ThingWithinDist (mobj_t *thing, INT32 limit_dist); From d8461bb44f84f07b1161c64cac89811fd5e0e6ab Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 27 Jul 2025 14:53:07 +0200 Subject: [PATCH 77/80] dont apply player camfade when exiting or in freecam mode also renames it and moves the check outside --- src/hardware/hw_main.c | 6 ++++-- src/hardware/hw_md2.c | 3 ++- src/r_things.c | 10 ++++++---- src/r_things.h | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 72249b5a9..5ecc2bd84 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -3707,7 +3707,8 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude; } - Surf.PolyColor.s.alpha = FixedMul(R_GetThingFade(spr->mobj), Surf.PolyColor.s.alpha); + if (cv_playerfade.value && spr->mobj->player) + Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha); if (HWR_UseShader()) { @@ -3996,7 +3997,8 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude; } - Surf.PolyColor.s.alpha = FixedMul(R_GetThingFade(spr->mobj), Surf.PolyColor.s.alpha); + if (cv_playerfade.value && spr->mobj->player) + Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha); if (HWR_UseShader()) { diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 6446a0790..327d72aff 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1227,7 +1227,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr) Surf.PolyFlags = HWR_GetBlendModeFlag(blendmode); } - Surf.PolyColor.s.alpha = FixedMul(R_GetThingFade(spr->mobj), Surf.PolyColor.s.alpha); + if (cv_playerfade.value && spr->mobj->player) + Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha); // dont forget to enabled the depth test because we can't do this like // before: polygons models are not sorted diff --git a/src/r_things.c b/src/r_things.c index 553e5d4d5..939756b3a 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -718,7 +718,7 @@ static void R_DrawFlippedMaskedColumn(column_t *column) // Based off of R_GetLinedefTransTable -transnum_t R_GetThingTransTable(fixed_t alpha, transnum_t transmap) +static transnum_t R_GetThingTransTable(fixed_t alpha, transnum_t transmap) { return (20*(FRACUNIT - ((alpha * (10 - transmap))/10) - 1) + FRACUNIT) >> (FRACBITS+1); } @@ -1586,7 +1586,8 @@ static void R_ProjectSprite(mobj_t *thing) else trans = 0; - trans = R_GetThingTransTable(R_GetThingFade(oldthing), trans); + if (cv_playerfade.value && oldthing->player) + trans = R_GetThingTransTable(R_DoPlayerFade(oldthing), trans); //SoM: 3/17/2000: Disregard sprites that are out of view.. if (vflip) @@ -2897,11 +2898,12 @@ boolean R_ThingWithinDist(mobj_t *thing, INT32 limit_dist) return true; } -fixed_t R_GetThingFade(mobj_t *thing) +fixed_t R_DoPlayerFade(mobj_t *thing) { fixed_t fadealpha = FRACUNIT; + static const tic_t countdownstarttime = (15 * TICRATE) / 4; // starttime - (3*TICRATE) - if (!cv_playerfade.value || leveltime < starttime-(3*TICRATE) || !thing->player || thing->player == viewplayer) + if (thing->player == viewplayer || viewplayer->exiting || camera[R_GetViewNumber()].freecam || leveltime < countdownstarttime) return fadealpha; const INT32 playerdist = (FixedMul((thing->x - viewx), viewcos) + FixedMul((thing->y - viewy), viewsin)) >> FRACBITS; diff --git a/src/r_things.h b/src/r_things.h index 6e3c95d67..5b1c7417e 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -76,7 +76,7 @@ void R_InitSprites(void); void R_ClearSprites(void); void R_DrawMasked(void); -fixed_t R_GetThingFade(mobj_t *thing); +fixed_t R_DoPlayerFade(mobj_t *thing); boolean R_ThingVisible (mobj_t *thing); boolean R_ThingWithinDist (mobj_t *thing, INT32 limit_dist); From e6f487474b5680e9fdc28fcb4047053ea9d3e0e3 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 27 Jul 2025 14:53:31 +0200 Subject: [PATCH 78/80] register chasecam with the other cam vars why dupe a loop --- src/r_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/r_main.c b/src/r_main.c index 7b58679ee..81b4e9e6b 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -403,7 +403,8 @@ angle_t R_PlayerSliptideAngle(player_t *player) sprframe = &sprdef->spriteframes[rot]; // No sprite frame? I guess it is possible - if (!sprframe) return 0; + if (!sprframe) + return 0; if (sprframe->rotate != SRF_SINGLE || (mo->frame & FF_PAPERSPRITE)) ang = R_PointToAngle(mo->x, mo->y) - mo->angle; @@ -463,6 +464,7 @@ boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixe return false; cullplane = cullheight->frontsector->floorheight; + if (cullheight->flags & ML_NOCLIMB) // Group culling { if (!viewcullheight) @@ -1523,10 +1525,6 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_fovchange); CV_RegisterVar(&cv_fov); - for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) - { - CV_RegisterVar(&cv_chasecam[i]); - } CV_RegisterVar(&cv_shadow); CV_RegisterVar(&cv_shadowoffs); CV_RegisterVar(&cv_skybox); @@ -1535,6 +1533,8 @@ void R_RegisterEngineStuff(void) for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) { + CV_RegisterVar(&cv_chasecam[i]); + CV_RegisterVar(&cv_cam_dist[i]); CV_RegisterVar(&cv_cam_still[i]); CV_RegisterVar(&cv_cam_height[i]); From ceafa06efcf4ac23d8bf765bfe7c5d79cfdf43bb Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Sat, 26 Jul 2025 11:58:55 -0500 Subject: [PATCH 79/80] Borderless window toggle --- src/sdl/i_video.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index faf4c67f7..e84cf1750 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -134,9 +134,12 @@ static INT32 desktopwidth = 0, desktopheight = 0; static void I_CheckDesktopRes(void); +static void VID_SetBorderless(void); + // synchronize page flipping with screen refresh consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Impl_SetVsync, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +static consvar_t cv_borderless = {"borderless", "Off", CV_SAVE|CV_CALL, CV_OnOff, VID_SetBorderless, 0, NULL, NULL, 0, 0, NULL}; static void mousegrabOnChange(void); consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE|CV_CALL, CV_OnOff, mousegrabOnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -273,6 +276,7 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) { wasfullscreen = SDL_TRUE; SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP); + VID_SetBorderless(); } else // windowed mode { @@ -2005,6 +2009,7 @@ void I_StartupGraphics(void) CV_RegisterVar (&cv_vidwait); CV_RegisterVar (&cv_stretch); CV_RegisterVar (&cv_alwaysgrabmouse); + CV_RegisterVar (&cv_borderless); disable_mouse = M_CheckParm("-nomouse"); disable_fullscreen = M_CheckParm("-win") ? 1 : 0; @@ -2289,4 +2294,10 @@ static void Impl_SetVsync(void) #endif } +static void VID_SetBorderless(void) +{ + SDL_bool borderless = (cv_borderless.value) ? SDL_FALSE : SDL_TRUE; + SDL_SetWindowBordered(window, borderless); +} + #endif From 845652cbfe582f5c96d418c0d8ba7fdcfdc762ca Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Sat, 26 Jul 2025 15:18:03 -0500 Subject: [PATCH 80/80] Make it a part of fullscreen cvar --- src/i_video.h | 2 ++ src/screen.c | 6 +++++- src/sdl/i_video.c | 12 ++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/i_video.h b/src/i_video.h index 70321d138..362e0237e 100644 --- a/src/i_video.h +++ b/src/i_video.h @@ -141,6 +141,8 @@ boolean I_UseNativeKeyboard(void); boolean I_CheckNativeRes(void); +void I_SetBorderlessWindow(void); + #ifdef USE_FBO_OGL void RefreshOGLSDLSurface(void); diff --git a/src/screen.c b/src/screen.c index e41b5360f..130128bf2 100644 --- a/src/screen.c +++ b/src/screen.c @@ -80,7 +80,9 @@ static void Highreshudscale_OnChange(void) static void SCR_ChangeFullscreen (void); -consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t fullscreen_cons_t[] = {{0, "No"}, {1, "Yes"}, {2, "Borderless Window"}, {0, NULL}}; + +consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, fullscreen_cons_t, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t accuratefps_cons_t[] = {{0, "Inaccurate"}, {1, "Accurate"}, {0, NULL}}; consvar_t cv_accuratefps = {"fpssampling", "1", CV_SAVE, accuratefps_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -310,6 +312,8 @@ void SCR_SetDefaultMode(void) void SCR_ChangeFullscreen(void) { #ifdef DIRECTFULLSCREEN + I_SetBorderlessWindow(); // Running this here so we can have borderless window at startup + // allow_fullscreen is set by VID_PrepareModeList // it is used to prevent switching to fullscreen during startup if (!allow_fullscreen) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index e84cf1750..b2e1c6048 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -134,12 +134,9 @@ static INT32 desktopwidth = 0, desktopheight = 0; static void I_CheckDesktopRes(void); -static void VID_SetBorderless(void); - // synchronize page flipping with screen refresh consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Impl_SetVsync, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -static consvar_t cv_borderless = {"borderless", "Off", CV_SAVE|CV_CALL, CV_OnOff, VID_SetBorderless, 0, NULL, NULL, 0, 0, NULL}; static void mousegrabOnChange(void); consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE|CV_CALL, CV_OnOff, mousegrabOnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -153,7 +150,7 @@ UINT8 graphics_started = 0; // Is used in console.c and screen.c // To disable fullscreen at startup; is set in VID_PrepareModeList boolean allow_fullscreen = false; static SDL_bool disable_fullscreen = SDL_FALSE; -#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)?0:cv_fullscreen.value +#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)? 0: (cv_fullscreen.value == 1) static SDL_bool disable_mouse = SDL_FALSE; #define USE_MOUSEINPUT (!disable_mouse && cv_usemouse.value && havefocus) #define MOUSE_MENU false //(!disable_mouse && cv_usemouse.value && menuactive && !USE_FULLSCREEN) @@ -276,7 +273,7 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) { wasfullscreen = SDL_TRUE; SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP); - VID_SetBorderless(); + I_SetBorderlessWindow(); } else // windowed mode { @@ -2009,7 +2006,6 @@ void I_StartupGraphics(void) CV_RegisterVar (&cv_vidwait); CV_RegisterVar (&cv_stretch); CV_RegisterVar (&cv_alwaysgrabmouse); - CV_RegisterVar (&cv_borderless); disable_mouse = M_CheckParm("-nomouse"); disable_fullscreen = M_CheckParm("-win") ? 1 : 0; @@ -2294,9 +2290,9 @@ static void Impl_SetVsync(void) #endif } -static void VID_SetBorderless(void) +void I_SetBorderlessWindow(void) { - SDL_bool borderless = (cv_borderless.value) ? SDL_FALSE : SDL_TRUE; + SDL_bool borderless = (cv_fullscreen.value == 2) ? SDL_FALSE : SDL_TRUE; SDL_SetWindowBordered(window, borderless); }