From cc248d7c44f7040236a1dc97df7ee8032d55ab7a Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 12 Aug 2023 17:51:01 +0300 Subject: [PATCH 1/5] Remove op_video_gravstretch from video options enum since it isn't here anymore. OpenGL options should be hidden in software mode again now --- src/m_menu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/m_menu.c b/src/m_menu.c index e2901f984..437d7761f 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1327,7 +1327,6 @@ enum op_video_vsync, op_video_fpscap, op_video_driftsparkpulse, - op_video_gravstretch, #ifdef HWRENDER op_video_ogl, #endif -- 2.54.0 From 0cad0f8828c7aeb8b93019f15e2a05f6f3e7de87 Mon Sep 17 00:00:00 2001 From: Alug <136046486+alufolie91@users.noreply.github.com> Date: Sat, 12 Aug 2023 16:59:31 +0200 Subject: [PATCH 2/5] Update README.md ee hope i didnt forget anything --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b5f70f9e3..36659251d 100644 --- a/README.md +++ b/README.md @@ -9,24 +9,26 @@ - Lua shows tracebacks whenever an error occurs - The Lua perfstat page now has multiple pages and is more organized (ps_thinkframe_page X) - "addfilelocal" Command, for those who want to use their custom hud in netgames (Same as addfile but completely client sided) +- OpenMPT for Tracker module playback (Complete with filters) fixed looping issue while even sounding better than the old GME playback +- Music changes now properly show the music credits +- Configurable chatlog size +- Lua hooks for Intermission +- Timeout for waiting to join a full server is configurable now +- Higher/configurable addon download speed - Visual Portals from haya´s HEP Client +- Everything that galaxy has Techical Stuff: - ZFigthing Textures in Opengl mode have been fixed in engine (well almost all of it) - Fof´s intersecting with slopes have less issues and now render correctly in Opengl - Midtextures on slopes in Opengl arent broken anymore, all those weird guardrails and fences, aswell as some of those sticking out textures from the ground on some maps should be gone. -- A longstanding crash with "fading music changes" has been fixed -- A crash after long play sessions or when hosting a listen server regarding "FreeColormipmaps" has been fixed - Multiple other fixes/optimizations like 3D floor clipping in software mode +- Zone memory allocations have been rewritten +- The annoying depraction messages for "P_TeleportMove" and "P_AproxDistance" have been silenced ## Bugs -- Joining a netgame midrace makes all sprites invisible until the next mapchange. -(Sadly unfixable without breaking netgame compability) - -- For the reason mentioned above, sometimes when rewinding a recorded replay from a netgame, playersprites may disappear, however normal playback is fine. - ## Dependencies - NASM (x86 builds only) - SDL2 (Linux/OS X only) -- 2.54.0 From c438f14599a2ed6b9a42fcf3ecf747961458301f Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Sat, 12 Aug 2023 17:13:04 +0200 Subject: [PATCH 3/5] v7.1 cause why not --- src/doomdef.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index 09d00aba8..5b1f35a34 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -149,8 +149,8 @@ extern char logfilename[1024]; #else #define VERSION 1 // Game version #define SUBVERSION 6 // more precise version number -#define VERSIONSTRING "Saturn v7.0 " -#define VERSIONSTRINGW L"Saturn v7.0" +#define VERSIONSTRING "Saturn v7.1 " +#define VERSIONSTRINGW L"Saturn v7.1" // 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! -- 2.54.0 From 179d2ab764c82d97bbe31c8e38f8442996e2d5ec Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Sat, 12 Aug 2023 18:21:15 +0200 Subject: [PATCH 4/5] Cleaned up and translated some comments brap --- src/hardware/hw_cache.c | 3 +-- src/hardware/r_opengl/r_opengl.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index 971dd67fd..c27e17a16 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -25,7 +25,7 @@ #include "../z_zone.h" #include "../v_video.h" #include "../r_draw.h" -#include "../r_patch.h" // sneed's feed and seed, formerly chuck's +#include "../r_patch.h" // patch rotation // Values set after a call to HWR_ResizeBlock() static INT32 blocksize, blockwidth, blockheight; @@ -706,7 +706,6 @@ static void HWR_LoadMappedPatch(GLMipmap_t *grmip, GLPatch_t *gpatch) // You can't free rawpatch for some reason? // (Obviously I can't, sprite rotation needs that...) - // Fuckal: I HATE HARDWARE, I HATE HARDWARE!! if (!gpatch->rawpatch) Z_Free(patch); } diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 9c8074f56..04fe8783e 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -1142,8 +1142,8 @@ void Flush(void) while (gr_cachehead) { - // ceci n'est pas du tout necessaire vu que tu les a charger normalement et - // donc il sont dans ta liste ! + // this is not necessary at all, because you have loaded them normally, + // and so they already are in your list! if (gr_cachehead->downloaded) pglDeleteTextures(1, (GLuint *)&gr_cachehead->downloaded); gr_cachehead->downloaded = 0; @@ -1731,11 +1731,11 @@ EXPORT void HWRAPI(SetTexture) (FTextureInfo *pTexInfo) pTexInfo->nextmipmap = NULL; if (gr_cachetail) - { // insertion en fin de liste + { // insertion at the tail gr_cachetail->nextmipmap = pTexInfo; gr_cachetail = pTexInfo; } - else // initialisation de la liste + else // initialization of the linked list gr_cachetail = gr_cachehead = pTexInfo; } } -- 2.54.0 From 509e66b6b32269d890ed0c2c9ec965857cb91f10 Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 13 Aug 2023 11:44:35 +0300 Subject: [PATCH 5/5] Small hack to prevent map command spam crashing the game --- src/d_netcmd.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 3ddeb6b82..33697e97c 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2650,14 +2650,27 @@ ConcatCommandArgv (int start, int end) return final; } + +static tic_t last_map_cmd = 0; // // Warp to map code. // Called either from map console command, or idclev cheat. // // Largely rewritten by James. // +// Added small cooldown which prevents from spamming map command and crashing +// game. It is not wery good fix but oh well i can't find yet where are mobj's +// freed/allocated between map loads and why they crash game - Indev +// static void Command_Map_f(void) { + if (I_GetTime() - last_map_cmd < 20) { + CONS_Alert(CONS_WARNING, "Map command is used too frequently!\n"); + return; + } + + last_map_cmd = I_GetTime(); + size_t first_option; size_t option_force; size_t option_gametype; -- 2.54.0