From d7a1cc6702a3ebdd12c5b04d8888996a9cc4c92a Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 27 Mar 2024 21:31:45 +0100 Subject: [PATCH 1/7] Read only header bytes when creating textures list --- src/r_data.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/r_data.c b/src/r_data.c index 179c88492..0900ed2c1 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -384,7 +384,7 @@ Rloadtextures (INT32 i, INT32 w) UINT16 j; INT32 k; UINT16 texstart, texend, texturesLumpPos; - patch_t *patchlump; + patch_t patchlump; texpatch_t *patch; texture_t *texture; @@ -422,8 +422,7 @@ Rloadtextures (INT32 i, INT32 w) if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder continue; // If it is then SKIP IT } - - patchlump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE); + W_ReadLumpHeaderPwad(wadnum, lumpnum, &patchlump, 8, 0); // #define PNG_HEADER_SIZE (8) //CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),patchlump->width, patchlump->height); texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL); @@ -431,8 +430,8 @@ Rloadtextures (INT32 i, INT32 w) // Set texture properties. M_Memcpy(texture->name, W_CheckNameForNumPwad((UINT16)w, texstart + j), sizeof(texture->name)); texture->hash = quickncasehash(texture->name, 8); - texture->width = SHORT(patchlump->width); - texture->height = SHORT(patchlump->height); + texture->width = SHORT(patchlump.width); + texture->height = SHORT(patchlump.height); texture->patchcount = 1; texture->holes = false; @@ -443,8 +442,6 @@ Rloadtextures (INT32 i, INT32 w) patch->wad = (UINT16)w; patch->lump = texstart + j; - Z_Free(patchlump); - k = 1; while (k << 1 <= texture->width) k <<= 1; From 2ccf91fbfc155c644f8c8667b5475bc7bdd3b833 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 19 Apr 2024 03:52:21 +0200 Subject: [PATCH 2/7] Make FixedRem less laggy by just using the modulo operator. --- src/m_fixed.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/m_fixed.h b/src/m_fixed.h index 4e4c79c65..d67777162 100644 --- a/src/m_fixed.h +++ b/src/m_fixed.h @@ -121,14 +121,7 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedDiv(fixed_t a, fixed_t b) */ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedRem(fixed_t x, fixed_t y) { - const boolean n = x < 0; - x = abs(x); - while (x >= y) - x -= y; - if (n) - return -x; - else - return x; + return x % y; } /** \brief The FixedSqrt function From 463dccab8b077547ba959d6e3a4b4eb1ac7d4410 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 19 Apr 2024 04:22:29 +0200 Subject: [PATCH 3/7] some smol fixes --- src/dehacked.c | 2 +- src/g_game.c | 7 +++++-- src/p_mobj.c | 2 +- src/p_polyobj.c | 6 +++--- src/v_video.c | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 8c1ba8e4d..486584fa5 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -334,7 +334,7 @@ static void readPlayer(MYFILE *f, INT32 num) // It works down here, though. { INT32 numline = 0; - for (i = 0; i < MAXLINELEN-1; i++) + for (i = 0; (size_t)i < sizeof(description[num].notes)-1; i++) { if (numline < 20 && description[num].notes[i] == '\n') numline++; diff --git a/src/g_game.c b/src/g_game.c index d7ac0e8ff..4161c6ca7 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -5897,7 +5897,7 @@ void G_GhostTicker(void) if (ziptic & EZT_THOKMASK) { // Let's only spawn ONE of these per frame, thanks. mobj_t *mobj; - INT32 type = -1; + UINT32 type = MT_NULL; if (g->mo->skin) { switch (ziptic & EZT_THOKMASK) @@ -6221,7 +6221,10 @@ void G_ReadMetalTic(mobj_t *metal) // Read changes from the tic if (ziptic & GZT_XYZ) { - P_MoveOrigin(metal, READFIXED(metal_p), READFIXED(metal_p), READFIXED(metal_p)); + oldmetal.x = READFIXED(metal_p); + oldmetal.y = READFIXED(metal_p); + oldmetal.z = READFIXED(metal_p); + P_MoveOrigin(metal, oldmetal.x, oldmetal.y, oldmetal.z); oldmetal.x = metal->x; oldmetal.y = metal->y; oldmetal.z = metal->z; diff --git a/src/p_mobj.c b/src/p_mobj.c index cbc08c02c..67d5b695b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1329,7 +1329,7 @@ void P_XYMovement(mobj_t *mo) fixed_t oldx, oldy; // reducing bobbing/momentum on ice when up against walls boolean moved; pslope_t *oldslope = NULL; - vector3_t slopemom; + vector3_t slopemom = {0,0,0}; fixed_t predictedz = 0; I_Assert(mo != NULL); diff --git a/src/p_polyobj.c b/src/p_polyobj.c index fa98ad9a5..9a3376595 100644 --- a/src/p_polyobj.c +++ b/src/p_polyobj.c @@ -1206,7 +1206,7 @@ static boolean Polyobj_moveXY(polyobj_t *po, fixed_t x, fixed_t y) // http://www.inversereality.org/tutorials/graphics%20programming/2dtransformations.html // It is, of course, just a vector-matrix multiplication. // -static inline void Polyobj_rotatePoint(vertex_t *v, const vertex_t *c, angle_t ang) +static inline void Polyobj_rotatePoint(vertex_t *v, const vector2_t *c, angle_t ang) { vertex_t tmp = *v; @@ -1267,7 +1267,7 @@ static void Polyobj_rotateLine(line_t *ld) // // Causes objects resting on top of the rotating polyobject to 'ride' with its movement. // -static void Polyobj_rotateThings(polyobj_t *po, vertex_t origin, angle_t delta, UINT8 turnthings) +static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta, UINT8 turnthings) { static INT32 pomovecount = 10000; INT32 x, y; @@ -1367,7 +1367,7 @@ static boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings) { size_t i; angle_t angle; - vertex_t origin; + vector2_t origin; INT32 hitflags = 0; // don't move bad polyobjects diff --git a/src/v_video.c b/src/v_video.c index 7b9383f06..4ea028cc3 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -3370,7 +3370,7 @@ void V_Init(void) #ifdef DEBUG CONS_Debug(DBG_RENDER, "V_Init done:\n"); - for (i = 0; i < NUMSCREENS+1; i++) + for (i = 0; i < NUMSCREENS; i++) CONS_Debug(DBG_RENDER, " screens[%d] = %x\n", i, screens[i]); #endif } From 9317ccd0be92a7f3d9b6cbda758cf93c0d77d945 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 19 Apr 2024 06:22:44 +0200 Subject: [PATCH 4/7] more things -Fix a division by zero in BCZ2 Metal Sonic's routine -Fix a bug where adding the same mod multiple times counted towards the mod limit and other thigns --- src/p_mobj.c | 11 +++++------ src/r_data.c | 13 +++++++++++-- src/w_wad.c | 6 ++++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 67d5b695b..94226face 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -4978,18 +4978,17 @@ static void P_Boss9Thinker(mobj_t *mobj) mobj->angle -= InvAngle(angle)/8; // Spawn energy particles - for (spawner = mobj->hnext; spawner; spawner = spawner->hnext) { + for (spawner = mobj->hnext; spawner; spawner = spawner->hnext) + { dist = P_AproxDistance(spawner->x - mobj->x, spawner->y - mobj->y); if (P_RandomRange(1,(dist>>FRACBITS)/16) == 1) break; } - if (spawner) { + if (spawner && dist) + { mobj_t *missile = P_SpawnMissile(spawner, mobj, MT_MSGATHER); missile->momz = FixedDiv(missile->momz, 7*FRACUNIT/4); - if (dist == 0) - missile->fuse = 0; - else - missile->fuse = (dist/P_AproxDistance(missile->momx, missile->momy)); + missile->fuse = (dist/P_AproxDistance(missile->momx, missile->momy)); if (missile->fuse > mobj->fuse) P_RemoveMobj(missile); } diff --git a/src/r_data.c b/src/r_data.c index 772d76925..69b0ce1ac 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -1088,6 +1088,7 @@ void R_ReInitColormaps(UINT16 num, lumpnum_t newencoremap) { char colormap[9] = "COLORMAP"; lumpnum_t lump; + const lumpnum_t basecolormaplump = W_GetNumForName(colormap); if (num > 0 && num <= 10000) snprintf(colormap, 8, "CLM%04u", num-1); @@ -1095,8 +1096,16 @@ void R_ReInitColormaps(UINT16 num, lumpnum_t newencoremap) // Load in the light tables, now 64k aligned for smokie... lump = W_GetNumForName(colormap); if (lump == LUMPERROR) - lump = W_GetNumForName("COLORMAP"); - W_ReadLump(lump, colormaps); + lump = basecolormaplump; + else + { + if (W_LumpLength(lump) != W_LumpLength(basecolormaplump)) + { + CONS_Alert(CONS_WARNING, "%s lump size does not match COLORMAP, results may be unexpected.\n", colormap); + } + } + + W_ReadLumpHeader(lump, colormaps, W_LumpLength(basecolormaplump), 0U); // Encore mode. if (newencoremap != LUMPERROR) diff --git a/src/w_wad.c b/src/w_wad.c index 86536c03f..103e12998 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -186,9 +186,9 @@ FILE *W_OpenWadFile(const char **filename, boolean useerrors) if (filenamebuf != *filename) { // avoid overlap strncpy(filenamebuf, *filename, MAX_WADPATH); + filenamebuf[MAX_WADPATH - 1] = '\0'; + *filename = filenamebuf; } - filenamebuf[MAX_WADPATH - 1] = '\0'; - *filename = filenamebuf; // open wad file if ((handle = fopen_utf8(*filename, "rb")) == NULL) @@ -755,6 +755,8 @@ UINT16 W_InitFile(const char *filename, boolean local) if (!memcmp(wadfiles[i]->md5sum, md5sum, 16)) { CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename); + if (important) + packetsizetally -= nameonlylength(filename) + 22; if (handle) fclose(handle); return INT16_MAX; From a238b19c750e41d4e544c454415110f9eb8ddb3b Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 19 Apr 2024 05:08:47 +0200 Subject: [PATCH 5/7] z --- src/w_wad.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/w_wad.c b/src/w_wad.c index 103e12998..cd2968494 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -755,8 +755,6 @@ UINT16 W_InitFile(const char *filename, boolean local) if (!memcmp(wadfiles[i]->md5sum, md5sum, 16)) { CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename); - if (important) - packetsizetally -= nameonlylength(filename) + 22; if (handle) fclose(handle); return INT16_MAX; From bcf2b3bab2f63ddbcad2179e4fba3a7a070d4ea2 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 19 Apr 2024 06:21:58 +0200 Subject: [PATCH 6/7] disable palette rendering if screentextures aint enabled --- src/hardware/hw_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index ff7f2a207..dc2af869e 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -177,6 +177,8 @@ static void CV_anisotropic_ONChange(void) static void CV_screentextures_ONChange(void) { ONLY_IF_GL_LOADED + if (cv_grscreentextures.value != 3) + CV_Set(&cv_grpaletterendering, "Off"); HWD.pfnSetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_grscreentextures.value); } From ea0cc41d04919a9831937a873adc8a369ace9a94 Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 20 Apr 2024 10:30:21 +0300 Subject: [PATCH 7/7] For MIN/MAX value of cvar, convert it to float before saving for CV_FLOAT variables --- src/command.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/command.c b/src/command.c index 37e120d52..b7e1e01de 100644 --- a/src/command.c +++ b/src/command.c @@ -2132,7 +2132,12 @@ void CV_SaveVariables(FILE *f) // Silly hack for Min/Max vars if (!strcmp(cvar->string, "MAX") || !strcmp(cvar->string, "MIN")) - sprintf(stringtowrite, "%d", cvar->value); + { + if (cvar->flags & CV_FLOAT) + sprintf(stringtowrite, "%f", FixedToFloat(cvar->value)); + else + sprintf(stringtowrite, "%d", cvar->value); + } else strcpy(stringtowrite, cvar->string);