From 33c03f1e7a352de95596be9b4c6d2cdfdade028f Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Sat, 24 May 2025 09:02:49 -0500 Subject: [PATCH 01/62] Adjust the amplitude of GL underwater effect Also fixed a string truncation warning --- src/hardware/hw_main.c | 2 +- src/sdl/ogl_sdl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 88a2e9a1e..94767ff5d 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -6020,7 +6020,7 @@ static void HWR_DoPostProcessor(player_t *player) if (thiscam->postimg & POSTIMG_WATER) { WAVELENGTH = 5; - AMPLITUDE = 20; + AMPLITUDE = 40; FREQUENCY = 8; } else diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c index d4dec6124..c8701506e 100644 --- a/src/sdl/ogl_sdl.c +++ b/src/sdl/ogl_sdl.c @@ -212,7 +212,7 @@ boolean OglSdlSurface(INT32 w, INT32 h) #ifdef USE_FBO_OGL char videodriver[4] = {'S','D','L',0}; if (supportFBO && strstr((const char*)gl_renderer, "NVIDIA") - && (*strncpy(videodriver, SDL_GetCurrentVideoDriver(), 4) != '\0') + && (*strncpy(videodriver, SDL_GetCurrentVideoDriver(), sizeof(videodriver)-1) != '\0') && (strncasecmp("x11",videodriver,4) == 0)) xwaylandcrap = true; #endif From a4566e94966d60eef10ec6cfa296620ba332615e Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 25 May 2025 13:59:36 +0100 Subject: [PATCH 02/62] v8.2 --- src/doomdef.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index ab6385659..f9467199b 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.1" -#define VERSIONSTRINGW L"Saturn v8.1" +#define VERSIONSTRING "Saturn v8.2" +#define VERSIONSTRINGW L"Saturn v8.2" // 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 1e15816057a92f84d930c78e61d5609f4d5681fb Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 25 May 2025 17:36:25 +0200 Subject: [PATCH 03/62] make screen tilt stuff slightly prettier lel --- src/p_user.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 8151c28aa..bbf3d2478 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -4296,19 +4296,17 @@ void P_DoTimeOver(player_t *player) exitcountdown = 5*TICRATE; } - /* gaysed script from me, based on Golden's sprite slope roll */ - +/* gaysed script from me, based on Golden's sprite slope roll */ // holy SHIT -static INT32 -Quaketilt (player_t *player) +static INT32 Quaketilt(player_t *player) { - angle_t tilt; + angle_t tilt, moma; fixed_t lowb; // this threshold for speed - angle_t moma = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); - INT32 delta = (INT32)( player->mo->angle - moma ); + INT32 delta; fixed_t speed; - boolean sliptiding = player->kartstuff[k_drift] ? 0 : player->kartstuff[k_aizdriftstrat]; + moma = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); + delta = (INT32)( player->mo->angle - moma ); if (delta == (INT32)ANGLE_180)/* FUCK YOU HAVE A HACK */ { @@ -4318,6 +4316,9 @@ Quaketilt (player_t *player) // Hi! I'm "not a math guy"! if (abs(delta) > ANGLE_90) delta = (INT32)(( moma + ANGLE_180 ) - player->mo->angle ); + + const boolean sliptiding = player->kartstuff[k_drift] ? 0 : player->kartstuff[k_aizdriftstrat]; + if (P_IsObjectOnGround(player->mo)) { if (sliptiding) @@ -4336,23 +4337,24 @@ Quaketilt (player_t *player) tilt = ANGLE_22h; lowb = 10*FRACUNIT; } + lowb = FixedMul(lowb, player->mo->scale); moma = FixedMul(FixedDiv(delta, ANGLE_90), tilt); speed = abs( player->mo->momx + player->mo->momy ); + if (speed < lowb) { // ease out tilt as we slow... moma = FixedMul(moma, FixedDiv(speed, lowb)); } + return moma; } -static void -DoABarrelRoll (player_t *player) +static void DoABarrelRoll(player_t *player) { - angle_t slope; + angle_t slope = 0; angle_t delta; - fixed_t smoothing; if (player->exiting) @@ -4370,10 +4372,6 @@ DoABarrelRoll (player_t *player) { slope = player->mo->standingslope->real_zangle; } - else - { - slope = 0; - } if (abs((INT32)slope) > ANGLE_11hh) { @@ -4394,7 +4392,7 @@ DoABarrelRoll (player_t *player) smoothing = FixedDiv(AbsAngle(slope), ANGLE_45); delta = FixedDiv(delta, cv_tiltsmoothing.value * - FixedDiv(FRACUNIT, FRACUNIT + smoothing)); + FixedDiv(FRACUNIT, FRACUNIT + smoothing)); if (delta) player->tilt += delta; From 95b4228d3c0347a8e4d65f257b429427076a1564 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 26 May 2025 10:51:03 +0100 Subject: [PATCH 04/62] update windoze libbacktrace never was updated since we added this 2 years ago lel --- libs/libbacktrace/include/backtrace.h | 17 +++++++++-------- libs/libbacktrace/lib/x86_64/libbacktrace.a | Bin 57136 -> 314252 bytes 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libs/libbacktrace/include/backtrace.h b/libs/libbacktrace/include/backtrace.h index 777e1460b..de92a3afb 100644 --- a/libs/libbacktrace/include/backtrace.h +++ b/libs/libbacktrace/include/backtrace.h @@ -1,5 +1,5 @@ /* backtrace.h -- Public header file for stack backtrace library. - Copyright (C) 2012-2020 Free Software Foundation, Inc. + Copyright (C) 2012-2024 Free Software Foundation, Inc. Written by Ian Lance Taylor, Google. Redistribution and use in source and binary forms, with or without @@ -54,13 +54,14 @@ struct backtrace_state; invalid after this function returns. As a special case, the ERRNUM argument will be passed as -1 if no - debug info can be found for the executable, but the function - requires debug info (e.g., backtrace_full, backtrace_pcinfo). The - MSG in this case will be something along the lines of "no debug - info". Similarly, ERRNUM will be passed as -1 if there is no - symbol table, but the function requires a symbol table (e.g., - backtrace_syminfo). This may be used as a signal that some other - approach should be tried. */ + debug info can be found for the executable, or if the debug info + exists but has an unsupported version, but the function requires + debug info (e.g., backtrace_full, backtrace_pcinfo). The MSG in + this case will be something along the lines of "no debug info". + Similarly, ERRNUM will be passed as -1 if there is no symbol table, + but the function requires a symbol table (e.g., backtrace_syminfo). + This may be used as a signal that some other approach should be + tried. */ typedef void (*backtrace_error_callback) (void *data, const char *msg, int errnum); diff --git a/libs/libbacktrace/lib/x86_64/libbacktrace.a b/libs/libbacktrace/lib/x86_64/libbacktrace.a index 891dd11d698405090a096cffcee59a3dde6b7906..4b4447b5854ddb63b3235ffe47774e2a4687f7cf 100644 GIT binary patch literal 314252 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 PD?1!L!#~~p_eYdhw-dDP?D}z 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 u^i84vsVxj-{BAxQOWDJQL9OsM^jCkkWAX} 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

VA25i#Rc>G0jvKN( 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 Date: Tue, 27 May 2025 18:30:55 +0200 Subject: [PATCH 05/62] Print the current SDL_mixer version when initializing the sound system --- src/sdl/mixer_sound.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index 647958653..fbdf6d005 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -213,7 +213,17 @@ void I_StartupSound(void) // call to start audio failed -- we do not have it return; } - + + SDL_version SDLmixcompiled; + const SDL_version *SDLmixlinked; + SDL_MIXER_VERSION(&SDLmixcompiled) + SDLmixlinked = Mix_Linked_Version(); + + I_OutputMsg("Compiled for SDL_mixer version: %d.%d.%d\n", + SDLmixcompiled.major, SDLmixcompiled.minor, SDLmixcompiled.patch); + I_OutputMsg("Linked with SDL_mixer version: %d.%d.%d\n", + SDLmixlinked->major, SDLmixlinked->minor, SDLmixlinked->patch); + #ifdef HAVE_OPENMPT CONS_Printf("libopenmpt version: %s\n", openmpt_get_string("library_version")); CONS_Printf("libopenmpt build date: %s\n", openmpt_get_string("build")); From e8969b0645fa760538b80c44fd5195497a5a8d46 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 27 May 2025 18:30:30 +0200 Subject: [PATCH 06/62] dont always print openmpt version to console just use I_OutputMsg instead --- src/sdl/mixer_sound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index fbdf6d005..9035e8241 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -225,8 +225,8 @@ void I_StartupSound(void) SDLmixlinked->major, SDLmixlinked->minor, SDLmixlinked->patch); #ifdef HAVE_OPENMPT - CONS_Printf("libopenmpt version: %s\n", openmpt_get_string("library_version")); - CONS_Printf("libopenmpt build date: %s\n", openmpt_get_string("build")); + I_OutputMsg("libopenmpt version: %s\n", openmpt_get_string("library_version")); + I_OutputMsg("libopenmpt build date: %s\n", openmpt_get_string("build")); #endif sound_started = true; From 7c87b5259a621c062c7c6a5b5cc52fc21f49e5a8 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 15:38:25 +0200 Subject: [PATCH 07/62] port SRB2s new makefiles + add dedicated build (squashed) also fix some of the new warnings to make a dedicated build just pass DEDICATED=1 to the compiler TODO:make this compatible with bluajit --- .gitignore | 15 +- bin/FreeBSD/Debug/.gitignore | 2 - bin/FreeBSD/Release/.gitignore | 2 - bin/Linux/Debug/.gitignore | 1 - bin/Linux/Release/.gitignore | 3 - bin/Linux64/Debug/.gitignore | 1 - bin/Linux64/Release/.gitignore | 1 - bin/Mingw/Debug/.gitignore | 4 - bin/Mingw/Release/.gitignore | 4 - bin/Mingw64/Debug/.gitignore | 3 - bin/Mingw64/Release/.gitignore | 4 - bin/SDL/Debug/.gitignore | 2 - bin/SDL/Release/.gitignore | 2 - bin/dummy/.gitignore | 2 - objs/.gitignore | 8 - objs/FreeBSD/SDL/Debug/.gitignore | 2 - objs/FreeBSD/SDL/Release/.gitignore | 2 - objs/Linux/SDL/Debug/.gitignore | 2 - objs/Linux/SDL/Release/.gitignore | 2 - objs/Linux64/SDL/Debug/.gitignore | 2 - objs/Linux64/SDL/Release/.gitignore | 2 - objs/MasterClient/.gitignore | 2 - objs/MasterServer/.gitignore | 2 - objs/Mingw/Debug/.gitignore | 2 - objs/Mingw/Release/.gitignore | 2 - objs/Mingw/SDL/Debug/.gitignore | 2 - objs/Mingw/SDL/Release/.gitignore | 2 - objs/Mingw64/Debug/.gitignore | 2 - objs/Mingw64/Release/.gitignore | 2 - objs/Mingw64/SDL/Debug/.gitignore | 2 - objs/Mingw64/SDL/Release/.gitignore | 2 - objs/SDL/Release/.gitignore | 2 - objs/cygwin/Debug/.gitignore | 2 - objs/cygwin/Release/.gitignore | 2 - objs/dummy/.gitignore | 2 - src/CMakeLists.txt | 14 +- src/Makefile | 1056 +++++-------- src/Makefile.d/dedicated.mk | 24 + src/Makefile.d/detect.mk | 124 ++ src/Makefile.d/features.mk | 106 ++ src/Makefile.d/haiku.mk | 71 + src/Makefile.d/nix.mk | 47 + src/Makefile.d/old.mk | 16 + src/Makefile.d/platform.mk | 76 + src/Makefile.d/sdl.mk | 71 + src/Makefile.d/util.mk | 93 ++ src/Makefile.d/versions.mk | 174 +++ src/Makefile.d/win32.mk | 124 ++ src/Sourcefile | 97 ++ src/blua/Sourcefile | 26 + src/d_main.c | 2 + src/d_netcmd.c | 2 - src/dedicated/CMakeLists.txt | 108 ++ src/dedicated/Sourcefile | 7 + src/dedicated/dosstr.c | 38 + src/dedicated/endtxt.c | 234 +++ src/dedicated/endtxt.h | 24 + src/dedicated/i_main.c | 238 +++ src/dedicated/i_sound.c | 339 ++++ src/dedicated/i_system.c | 2218 +++++++++++++++++++++++++++ src/dedicated/i_threads.c | 364 +++++ src/dedicated/i_video.c | 154 ++ src/g_game.c | 5 +- src/hardware/Sourcefile | 14 + src/m_menu.c | 2 +- src/m_misc.c | 3 +- src/p_mobj.c | 4 +- src/sdl/Sourcefile | 7 + src/sdl/i_main.c | 2 +- src/sdl/i_system.c | 2 +- src/w_wad.c | 2 + 71 files changed, 5173 insertions(+), 809 deletions(-) delete mode 100644 bin/FreeBSD/Debug/.gitignore delete mode 100644 bin/FreeBSD/Release/.gitignore delete mode 100644 bin/Linux/Debug/.gitignore delete mode 100644 bin/Linux/Release/.gitignore delete mode 100644 bin/Linux64/Debug/.gitignore delete mode 100644 bin/Linux64/Release/.gitignore delete mode 100644 bin/Mingw/Debug/.gitignore delete mode 100644 bin/Mingw/Release/.gitignore delete mode 100644 bin/Mingw64/Debug/.gitignore delete mode 100644 bin/Mingw64/Release/.gitignore delete mode 100644 bin/SDL/Debug/.gitignore delete mode 100644 bin/SDL/Release/.gitignore delete mode 100644 bin/dummy/.gitignore delete mode 100644 objs/.gitignore delete mode 100644 objs/FreeBSD/SDL/Debug/.gitignore delete mode 100644 objs/FreeBSD/SDL/Release/.gitignore delete mode 100644 objs/Linux/SDL/Debug/.gitignore delete mode 100644 objs/Linux/SDL/Release/.gitignore delete mode 100644 objs/Linux64/SDL/Debug/.gitignore delete mode 100644 objs/Linux64/SDL/Release/.gitignore delete mode 100644 objs/MasterClient/.gitignore delete mode 100644 objs/MasterServer/.gitignore delete mode 100644 objs/Mingw/Debug/.gitignore delete mode 100644 objs/Mingw/Release/.gitignore delete mode 100644 objs/Mingw/SDL/Debug/.gitignore delete mode 100644 objs/Mingw/SDL/Release/.gitignore delete mode 100644 objs/Mingw64/Debug/.gitignore delete mode 100644 objs/Mingw64/Release/.gitignore delete mode 100644 objs/Mingw64/SDL/Debug/.gitignore delete mode 100644 objs/Mingw64/SDL/Release/.gitignore delete mode 100644 objs/SDL/Release/.gitignore delete mode 100644 objs/cygwin/Debug/.gitignore delete mode 100644 objs/cygwin/Release/.gitignore delete mode 100644 objs/dummy/.gitignore create mode 100644 src/Makefile.d/dedicated.mk create mode 100644 src/Makefile.d/detect.mk create mode 100644 src/Makefile.d/features.mk create mode 100644 src/Makefile.d/haiku.mk create mode 100644 src/Makefile.d/nix.mk create mode 100644 src/Makefile.d/old.mk create mode 100644 src/Makefile.d/platform.mk create mode 100644 src/Makefile.d/sdl.mk create mode 100644 src/Makefile.d/util.mk create mode 100644 src/Makefile.d/versions.mk create mode 100644 src/Makefile.d/win32.mk create mode 100644 src/Sourcefile create mode 100644 src/blua/Sourcefile create mode 100644 src/dedicated/CMakeLists.txt create mode 100644 src/dedicated/Sourcefile create mode 100644 src/dedicated/dosstr.c create mode 100644 src/dedicated/endtxt.c create mode 100644 src/dedicated/endtxt.h create mode 100644 src/dedicated/i_main.c create mode 100644 src/dedicated/i_sound.c create mode 100644 src/dedicated/i_system.c create mode 100644 src/dedicated/i_threads.c create mode 100644 src/dedicated/i_video.c create mode 100644 src/hardware/Sourcefile create mode 100644 src/sdl/Sourcefile diff --git a/.gitignore b/.gitignore index 8b73f04f5..7f8d56035 100644 --- a/.gitignore +++ b/.gitignore @@ -13,16 +13,17 @@ Win32_LIB_ASM_Release *.dgb *.debug *.debug.txt -/bin/VC10/ -/objs/VC10/ *.user *.db *.opendb /.vs /debian /assets/debian -compile.sh -*.gz -.vscode/ -out -build +/make +/bin +/build +/build/* +/CMakeUserPresets.json +/out +/objs/VC10 +*.kate-swp diff --git a/bin/FreeBSD/Debug/.gitignore b/bin/FreeBSD/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/bin/FreeBSD/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/bin/FreeBSD/Release/.gitignore b/bin/FreeBSD/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/bin/FreeBSD/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/bin/Linux/Debug/.gitignore b/bin/Linux/Debug/.gitignore deleted file mode 100644 index 56dee6f95..000000000 --- a/bin/Linux/Debug/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lsdlsrb2 diff --git a/bin/Linux/Release/.gitignore b/bin/Linux/Release/.gitignore deleted file mode 100644 index 5b5c54a54..000000000 --- a/bin/Linux/Release/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/lsdlsrb2 -/pnd -/*.mo diff --git a/bin/Linux64/Debug/.gitignore b/bin/Linux64/Debug/.gitignore deleted file mode 100644 index 56dee6f95..000000000 --- a/bin/Linux64/Debug/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lsdlsrb2 diff --git a/bin/Linux64/Release/.gitignore b/bin/Linux64/Release/.gitignore deleted file mode 100644 index c63fd53bc..000000000 --- a/bin/Linux64/Release/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lsdl2srb2kart diff --git a/bin/Mingw/Debug/.gitignore b/bin/Mingw/Debug/.gitignore deleted file mode 100644 index 3458ff764..000000000 --- a/bin/Mingw/Debug/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.exe -*.mo -r_opengl.dll -*.bat diff --git a/bin/Mingw/Release/.gitignore b/bin/Mingw/Release/.gitignore deleted file mode 100644 index 3458ff764..000000000 --- a/bin/Mingw/Release/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.exe -*.mo -r_opengl.dll -*.bat diff --git a/bin/Mingw64/Debug/.gitignore b/bin/Mingw64/Debug/.gitignore deleted file mode 100644 index e431dca5d..000000000 --- a/bin/Mingw64/Debug/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/srb2sdl.exe -/srb2win.exe -/r_opengl.dll diff --git a/bin/Mingw64/Release/.gitignore b/bin/Mingw64/Release/.gitignore deleted file mode 100644 index b2443f38d..000000000 --- a/bin/Mingw64/Release/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.exe -*.mo -r_opengl.dll -*.bat \ No newline at end of file diff --git a/bin/SDL/Debug/.gitignore b/bin/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/bin/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/bin/SDL/Release/.gitignore b/bin/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/bin/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/bin/dummy/.gitignore b/bin/dummy/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/bin/dummy/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/.gitignore b/objs/.gitignore deleted file mode 100644 index 35ecd6def..000000000 --- a/objs/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -#All folders -SRB2.res -depend.dep -depend.ped -*.o -#VC9 folder only -/VC9/Win32 -/VC9/x64 diff --git a/objs/FreeBSD/SDL/Debug/.gitignore b/objs/FreeBSD/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/FreeBSD/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/FreeBSD/SDL/Release/.gitignore b/objs/FreeBSD/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/FreeBSD/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Linux/SDL/Debug/.gitignore b/objs/Linux/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Linux/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Linux/SDL/Release/.gitignore b/objs/Linux/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Linux/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Linux64/SDL/Debug/.gitignore b/objs/Linux64/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Linux64/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Linux64/SDL/Release/.gitignore b/objs/Linux64/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Linux64/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/MasterClient/.gitignore b/objs/MasterClient/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/MasterClient/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/MasterServer/.gitignore b/objs/MasterServer/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/MasterServer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw/Debug/.gitignore b/objs/Mingw/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw/Release/.gitignore b/objs/Mingw/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw/SDL/Debug/.gitignore b/objs/Mingw/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw/SDL/Release/.gitignore b/objs/Mingw/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw64/Debug/.gitignore b/objs/Mingw64/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw64/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw64/Release/.gitignore b/objs/Mingw64/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw64/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw64/SDL/Debug/.gitignore b/objs/Mingw64/SDL/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw64/SDL/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/Mingw64/SDL/Release/.gitignore b/objs/Mingw64/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/Mingw64/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/SDL/Release/.gitignore b/objs/SDL/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/SDL/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/cygwin/Debug/.gitignore b/objs/cygwin/Debug/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/cygwin/Debug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/cygwin/Release/.gitignore b/objs/cygwin/Release/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/cygwin/Release/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/objs/dummy/.gitignore b/objs/dummy/.gitignore deleted file mode 100644 index 42c6dc2c6..000000000 --- a/objs/dummy/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# DON'T REMOVE -# This keeps the folder from disappearing diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 729b5896a..4ce38953d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -228,6 +228,14 @@ set(SRB2_CONFIG_STATIC_OPENGL OFF CACHE BOOL "Use statically linked OpenGL. NOT RECOMMENDED.") set(SRB2_CONFIG_USE_FBO_OGL ON CACHE BOOL "Enable OpenGL FBO Downsampling support.") +set(SRB2_CONFIG_DEDICATED OFF CACHE BOOL + "Build a dedicated server.") + +if(${SRB2_CONFIG_DEDICATED}) + set(SRB2_CONFIG_HAVE_GME NO) + set(SRB2_CONFIG_HAVE_OPENMPT NO) + set(SRB2_CONFIG_HWRENDER NO) +endif() ### use internal libraries? if(${CMAKE_SYSTEM} MATCHES "Windows") ###set on Windows only @@ -554,7 +562,11 @@ add_definitions(-DCMAKECONFIG) # ${SRB2_BLUA_HEADERS} #) -add_subdirectory(sdl) +if(${SRB2_CONFIG_DEDICATED}) + add_subdirectory(dedicated) +else() + add_subdirectory(sdl) +endif() if(NOT ${SRB2_SDL2_AVAILABLE} AND NOT ${SRB2_WIN32_AVAILABLE}) message(FATAL_ERROR "There are no targets available to build an SRB2Kart executable. :(") diff --git a/src/Makefile b/src/Makefile index b6077ba6c..e995b3ccf 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,783 +1,419 @@ - -# GNU Make makefile for SRB2 -############################################################################# -# Copyright (C) 1998-2000 by DooM Legacy Team. -# Copyright (C) 2003-2018 by Sonic Team Junior. +# GNU Makefile for SRB2 +# the poly3 Makefile adapted over and over... +# +# Copyright 1998-2000 DooM Legacy Team. +# Copyright 2020-2023 James R. +# Copyright 2003-2023 Sonic Team Junior. # # This program is free software distributed under the # terms of the GNU General Public License, version 2. # See the 'LICENSE' file for more details. # -# -DLINUX -> use for the GNU/Linux specific -# -DHAVE_SDL -> use for the SDL interface +# Special targets: # -# Sets: -# Compile the Mingw version with 'make MINGW=1' -# Compile the SDL/Mingw version with 'make MINGW=1 SDL=1' -# Compile the SDL/Linux version with 'make LINUX=1' -# Compile the SDL/Solaris version with 'make SOLARIS=1' -# Compile the SDL/FreeBSD version with 'gmake FREEBSD=1' -# Compile the SDL/Cygwin version with 'make CYGWIN32=1' -# Compile the SDL/other version try with 'make SDL=1' +# clean - remove executables and objects for this build +# cleandep - remove dependency files for this build +# distclean - remove entire executable, object and +# dependency file directory structure. +# dump - disassemble executable +# info - print settings # -# 'Targets': -# clean -# Remove all object files -# cleandep -# Remove depend.dep -# dll -# compile primary HW render DLL/SO -# all_dll -# compile all HW render and 3D sound DLLs for the set -# opengl_dll -# Pure Mingw only, compile OpenGL HW render DLL +# This Makefile can automatically detect the host system +# as well as the compiler version. If system or compiler +# version cannot be detected, you may need to set a flag +# manually. # # -# Addon: -# To Cross-Compile, CC=gcc-version make * PREFIX=

-# Compile with GCC 2.97 version, add 'GCC29=1' -# Compile with GCC 4.0x version, add 'GCC40=1' -# Compile with GCC 4.1x version, add 'GCC41=1' -# Compile with GCC 4.2x version, add 'GCC42=1' -# Compile with GCC 4.3x version, add 'GCC43=1' -# Compile with GCC 4.4x version, add 'GCC44=1' -# Compile with GCC 4.5x version, add 'GCC45=1' -# Compile with GCC 4.6x version, add 'GCC46=1' -# Compile a profile version, add 'PROFILEMODE=1' -# Compile a debug version, add 'DEBUGMODE=1' -# Compile with less warnings, add 'RELAXWARNINGS=1' -# Generate compiler errors for most compiler warnings, add 'ERRORMODE=1' -# Compile without 3D hardware support, add 'NOHW=1' -# Compile with GDBstubs, add 'RDB=1' -# Compile without PNG, add 'NOPNG=1' -# Compile without zlib, add 'NOZLIB=1' +# Platform/system flags: # -# Addon for SDL: -# To Cross-Compile, add 'SDL_CONFIG=/usr/*/bin/sdl-config' -# Compile without SDL_Mixer, add 'NOMIXER=1' -# Compile without BSD API, add 'NONET=1' -# Compile without IPX/SPX, add 'NOIPX=1' -# Compile without libopenmpt, add 'NOOPENMPT=1' -# To link with the whole SDL_Image lib to load Icons, add 'SDL_IMAGE=1' but it isn't not realy needed -# To link with SDLMain to hide console or make on a console-less binary, add 'SDLMAIN=1' +# LINUX=1, LINUX64=1 +# MINGW=1, MINGW64=1 - Windows (MinGW toolchain) +# UNIX=1 - Generic Unix like system +# FREEBSD=1 +# SDL=1 - Use SDL backend. SDL is the only implemented backend though. +# If disabled, a dummy backend will be used. # -############################################################################# +# A list of supported GCC versions can be found in +# Makefile.d/detect.mk -- search 'gcc_versions'. +# +# Feature flags: +# +# Safe to use online +# ------------------ +# NOHW=1 - Disable OpenGL renderer. +# NOSCREENFBO=1 - Disable screen FBO for downsampling in OpenGL. +# NOSATURNPAK=1 - Disable handling the special Saturn packet and resynch system +# NOSATURNJOIN=1 - Disable the seperate Saturn allowjoin toggle +# ZDEBUG=1 - Enable more detailed memory debugging +# HAVE_MINIUPNPC=1 - Enable automated port forwarding. +# Already enabled by default for 32-bit +# Windows. +# NOCURL=1 - Disable libcurl--HTTP capability. +# NOGME=1 - Disable game music emu, retro VGM support. +# NOOPENMPT=1 - Disable module (tracker) music support. +# NOMIXER=1 - Disable SDL Mixer (audio playback). +# NOTHREADS=1 - Disable multithreading. +# +# Netplay incompatible +# -------------------- +# NOMD5=1 - Disable MD5 checksum (validation tool). +# NOPOSTPROCESSING=1 - ? +# MOBJCONSISTANCY=1 - ?? +# PACKETDROP=1 - ?? +# NOEXECINFO=1 - Disable stack trace dump support +# DEBUGMODE=1 - Enable various debugging capabilities. +# Also disables optimizations. +# +# Development flags: +# +# VALGRIND=1 - Enable Valgrind memory debugging support. +# PROFILEMODE=1 - Enable performance profiling (gprof). +# USEASAN=1 - Enable building with Address Sanitizer. +# NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces. +# +# General flags for building: +# +# STATIC=1 - Use static linking. +# DISTCC=1 +# CCACHE=1 +# UPX= - UPX command to use for compressing final +# executable. +# WINDOWSHELL=1 - Use Windows commands. +# PREFIX= - Prefix to many commands, for cross compiling. +# STABS=1 - ? +# ECHO=1 - Print out each command in the build process. +# NOECHOFILENAMES=1 - Don't print out each that is being +# worked on. +# SILENT=1 - Print absolutely nothing except errors. +# RELAXWARNINGS=1 - Use less compiler warnings/errors. +# ERRORMODE=1 - Treat most compiler warnings as errors. +# NOCASTALIGNWARN=1 - ? +# NOLDWARNING=1 - ? +# NOSDLMAIN=1 - ? +# SDLMAIN=1 - ? +# USELTO=1 - Enable building with LTO. +# +# Library configuration flags: +# Everything here is an override. +# +# PNG_PKGCONFIG= - libpng-config command. +# PNG_CFLAGS=, PNG_LDFLAGS= +# +# CURLCONFIG= - curl-config command. +# CURL_CFLAGS=, CURL_LDFLAGS= +# +# VALGRIND_PKGCONFIG= - pkg-config package name. +# VALGRIND_CFLAGS=, VALGRIND_LDFLAGS= +# +# LIBGME_PKGCONFIG=, LIBGME_CFLAGS=, LIBGME_LDFLAGS= -ALL_SYSTEMS=\ - PANDORA\ - LINUX64\ - MINGW64\ - HAIKU\ - MINGW\ - UNIX\ - LINUX\ - SOLARIS\ - FREEBSD\ - MACOSX\ - SDL\ +# LIBOPENMPT_PKGCONFIG= +# LIBOPENMPT_CFLAGS=, LIBOPENMPT_LDFLAGS= +# +# ZLIB_PKGCONFIG=, ZLIB_CFLAGS=, ZLIB_LDFLAGS= +# +# SDL_PKGCONFIG= +# SDL_CONFIG= - sdl-config command. +# SDL_CFLAGS=, SDL_LDFLAGS= -# check for user specified system -ifeq (,$(filter $(ALL_SYSTEMS),$(.VARIABLES))) -ifeq ($(OS),Windows_NT) # all windows are Windows_NT... +NOBLUAJIT=1 - ifeq ($(shell uname -s | grep -o MINGW64),MINGW64) # 64-bit MinGW - $(info Detected a Windows system, compiling for 64-bit MinGW SDL2...) - MINGW64=1 - else # 32-bit MinGW - $(info Detected a Windows system, compiling for 32-bit MinGW SDL2...) - MINGW=1 - endif +clean_targets=cleandep clean distclean info - SDL=1 - WINDOWSHELL=1 - NOOBJDUMP=1 +.PHONY : $(clean_targets) all -else # if you on the *nix - system:=$(shell uname -s) +goals:=$(or $(MAKECMDGOALS),all) +cleanonly:=$(filter $(clean_targets),$(goals)) +destructive:=$(filter-out info,$(cleanonly)) - ifeq ($(system),Linux) - new_system=LINUX - else - - $(error \ - Could not automatically detect your system,\ - try specifying a system manually) - - endif - - ifeq ($(shell getconf LONG_BIT),64) - system+=64-bit - new_system:=$(new_system)64 - endif - - $(info Detected $(system) ($(new_system))...) - $(new_system)=1 - -endif +ifndef cleanonly +include Makefile.d/old.mk endif -NOUPX=1 +include Makefile.d/util.mk -# SRB2 data files -D_DIR?=../bin/Resources -D_FILES=$(D_DIR)/srb2.srb \ - $(D_DIR)/patch.dta \ - #$(D_DIR)/music.dta \ - $(D_DIR)/gfx.kart \ - $(D_DIR)/textures.kart \ - $(D_DIR)/chars.kart \ - $(D_DIR)/maps.kart \ - $(D_DIR)/sounds.kart \ - $(D_DIR)/patch.kart \ - $(D_DIR)/music.kart \ - -PKG_CONFIG?=pkg-config - -ifdef PANDORA -LINUX=1 -endif - -ifdef LINUX64 -LINUX=1 -NONX86=1 -# LINUX64 does not imply X86_64=1; could mean ARM64 or Itanium -endif - -ifdef MINGW64 -MINGW=1 -NONX86=1 -# MINGW64 should not necessarily imply X86_64=1, but we make that assumption elsewhere -# Once that changes, remove this -X86_64=1 -endif #ifdef MINGW64 - -ifdef HAIKU -SDL=1 -endif - -include Makefile.cfg - -ifdef HAIKU -NOIPX=1 -ifndef NONET -LIBS=-lnetwork -endif -CFLAGS+=-DUNIXCOMMON -PNG_CFLAGS?= -PNG_LDFLAGS?=-lpng -endif - -ifdef PANDORA -NONX86=1 -NOHW=1 -endif - -ifndef NOOPENMPT -HAVE_OPENMPT=1 -endif - -ifndef NOHW -ifndef NOSCREENFBO -USE_FBO_OGL=1 -endif -endif - -ifndef NONET -ifndef NOSATURNJOIN -DOSATURNJOIN=1 -endif -ifndef NOSATURNPAK -DOSATURNPAK=1 -endif -endif - -ifdef MINGW -include win32/Makefile.cfg -endif #ifdef MINGW - -ifdef UNIX -UNIXCOMMON=1 -endif - -ifdef LINUX -UNIXCOMMON=1 -NOOBJDUMP=1 -ifndef NOGME -HAVE_LIBGME=1 -endif -endif - -ifdef SOLARIS -UNIXCOMMON=1 -endif - -ifdef FREEBSD -UNIXCOMMON=1 -endif - -ifdef MACOSX -UNIXCOMMON=1 -endif - -ifdef SDL - include sdl/Makefile.cfg -endif #ifdef SDL - -ifdef DISTCC - CC:=distcc $(CC) -endif - -ifdef CCACHE - CC:=ccache $(CC) -endif - -MSGFMT?=msgfmt - -ifndef ECHO - REMOVE:=@$(REMOVE) - CC:=@$(CC) - CXX:=@$(CXX) - OBJCOPY:=@$(OBJCOPY) - OBJDUMP:=@$(OBJDUMP) - STRIP:=@$(STRIP) - WINDRES:=@$(WINDRES) - CP:=@$(CP) - MKDIR:=@$(MKDIR) - MKISOFS:=@$(MKISOFS) - DD:=@$(DD) - NDSTOOL:=@$(NDSTOOL) - GZIP:=@$(GZIP) - MSGFMT:=@$(MSGFMT) - UPX:=@$(UPX) - UPX_OPTS+=-q -endif - -ifdef NONET - OPTS+=-DNONET - NOCURL=1 -else -ifdef NO_IPV6 - OPTS+=-DNO_IPV6 -endif -endif - -ifdef NOHW - OPTS+=-DNOHW -else - OPTS+=-DHWRENDER - OBJS+=$(OBJDIR)/hw_bsp.o $(OBJDIR)/hw_draw.o \ - $(OBJDIR)/hw_main.o $(OBJDIR)/hw_clip.o $(OBJDIR)/hw_md2.o $(OBJDIR)/hw_cache.o $(OBJDIR)/hw_portal.o\ - $(OBJDIR)/hw_md2load.o $(OBJDIR)/hw_md3load.o $(OBJDIR)/hw_model.o $(OBJDIR)/u_list.o $(OBJDIR)/hw_batching.o $(OBJDIR)/hw_shaders.o -endif - -OPTS += -DCOMPVERSION - -ifndef NONX86 -ifndef GCC29 - ARCHOPTS?=-msse3 -mfpmath=sse -else - ARCHOPTS?=-mpentium -endif -else -ifdef X86_64 - ARCHOPTS?=-march=nocona -endif -endif - -# apparently MingW just completely ignores everything so just always force this shit -# FIXME: we should port our code to c24 -CFLAGS+=-std=gnu17 -CPPFLAGS+=-std=gnu17 - -ifndef NOPNG -OPTS+=-DHAVE_PNG - -ifdef PNG_PKGCONFIG -PNG_CFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --cflags) -PNG_LDFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --libs) -else ifdef PREFIX -PNG_CONFIG?=$(PREFIX)-libpng-config +CC:=$(PREFIX)-gcc +endif + +OBJDUMP_OPTS?=--wide --source --line-numbers + +OBJCOPY?=$(call Prefix,objcopy) +OBJDUMP?=$(call Prefix,objdump) +WINDRES?=$(call Prefix,windres) + +GZIP?=gzip +GZIP_OPTS?=-9 -f -n +ifdef WINDOWSHELL +GZIP_OPTS+=--rsyncable +endif + +UPX_OPTS?=--best --preserve-build-id +ifndef ECHO +UPX_OPTS+=-qq +endif + +include Makefile.d/detect.mk + +# make would try to remove the implicitly made directories +.PRECIOUS : %/ comptime.c + +sources:= +makedir:=../make + +# -DCOMPVERSION: flag to use comptime.h +opts:=-DCOMPVERSION -g +libs:= + +# This is a list of variables names, of which if defined, +# also defines the name as a macro to the compiler. +passthru_opts:= + +include Makefile.d/platform.mk +include Makefile.d/features.mk +include Makefile.d/versions.mk + +ifdef DEBUGMODE +makedir:=$(makedir)/debug +endif + +depdir:=$(makedir)/deps +objdir:=$(makedir)/objs + +# very sophisticated dependency +sources+=\ + $(call List,Sourcefile) + +ifdef NOBLUAJIT +sources+=\ + $(call List,blua/Sourcefile) else -PNG_CONFIG?=libpng-config +include bluajit/Makefile.cfg +include bluajit/Makefile.cfg2 endif -ifdef PNG_STATIC -PNG_CFLAGS?=$(shell $(PNG_CONFIG) --static --cflags) -PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --static --ldflags) +depends:=$(basename $(filter %.c %.cpp %.s,$(sources))) +objects:=$(basename $(filter %.c %.cpp %.s %.nas,$(sources))) + +depends:=$(depends:%=$(depdir)/%.d) + +# comptime.o added directly to objects instead of thru +# sources because comptime.c includes comptime.h, but +# comptime.h may not exist yet. It's a headache so this is +# easier. +objects:=$(objects:=.o) comptime.o + +# windows resource file +rc_file:=$(basename $(filter %.rc,$(sources))) +ifdef rc_file +objects+=$(rc_file:=.res) +endif + +objects:=$(addprefix $(objdir)/,$(objects)) + +ifdef DEBUGMODE +bin:=../bin/debug else -PNG_CFLAGS?=$(shell $(PNG_CONFIG) --cflags) -PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --ldflags) -endif +bin:=../bin endif -ifdef LINUX -PNG_CFLAGS+=-D_LARGEFILE64_SOURCE -endif +# default EXENAME (usually set by platform) +EXENAME?=srb2kart +DBGNAME?=$(EXENAME).debug -LIBS+=$(PNG_LDFLAGS) -CFLAGS+=$(PNG_CFLAGS) +exe:=$(bin)/$(EXENAME) +dbg:=$(bin)/$(DBGNAME) -OBJS+=$(OBJDIR)/apng.o -endif +build_done==== Build is done, look for \ + $( $@ + $(.)$(GZIP) $(GZIP_OPTS) $@ + +# '::' means run unconditionally +# this really updates comptime.h +comptime.c :: ifdef WINDOWSHELL -$(.)..\comptime.bat . else -$(.)../comptime.sh . endif -clean: cleandep - $(REMOVE) *~ *.flc - $(REMOVE) $(OBJDIR)/*.o +# I wish I could make dependencies out of rc files :( +$(objdir)/win32/Srb2win.res : \ + win32/afxres.h win32/resource.h -ifdef MINGW - $(REMOVE) $(OBJDIR)/*.res -endif - -ifdef CYGWIN32 - $(REMOVE) $(OBJDIR)/*.res -endif - - -# executable - -$(BIN)/$(EXENAME): $(POS) $(OBJS) - -$(MKDIR) $(BIN) - @echo Linking $(EXENAME)... - $(LD) $(LDFLAGS) $(OBJS) -o $(BIN)/$(EXENAME) $(LIBS) -ifndef VALGRIND -ifndef NOOBJDUMP - @echo Dumping debugging info - $(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(EXENAME) > $(BIN)/$(DBGNAME).txt - -$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt +# dependency recipe template +# 1: source file suffix +# 2: extra flags to gcc +define _recipe = +$(depdir)/%.d : %.$(1) | $$$$(@D)/ ifndef WINDOWSHELL - -$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt +ifdef Echo_name + @printf '%-20.20s\r' $$< endif +endif + $(.)$(cc) -MM -MF $$@ -MT $(objdir)/$$*.o $(2) $$< +endef + +$(eval $(call _recipe,c)) +$(eval $(call _recipe,cpp)) +$(eval $(call _recipe,s,$(asflags))) + +# compiling recipe template +# 1: target file suffix +# 2: source file suffix +# 3: compile command +define _recipe = +$(objdir)/%.$(1) : %.$(2) | $$$$(@D)/ + $(call Echo_name,$$<) + $(.)$(3) +endef + +$(eval $(call _recipe,o,c,$(cc) -c -o $$@ $$<)) +$(eval $(call _recipe,o,cpp,$(cxx) -c -o $$@ $$<)) +$(eval $(call _recipe,o,s,$(cc) $(asflags) -c -o $$@ $$<)) +$(eval $(call _recipe,res,rc,$(windres) -i $$< -o $$@)) + +_rm=$(.)$(rmrf) $(call Windows_path,$(1)) + +cleandep : + $(call _rm,$(depends) comptime.h) + +clean : + $(call _rm,$(exe) $(dbg) $(dbg).txt $(objects)) + +distclean : + $(call _rm,../bin ../objs ../dep ../make comptime.h) + +ifndef NOBLUAJIT + $(call _rm,$(objdir)/buildvm* $(objdir)/minilua* $(objdir)/lj_vm*) + +cleanjit: + $(call _rm,$(objdir)/buildvm* $(objdir)/minilua* $(objdir)/lj_vm* $(ALL_HDRGEN) $(LJVMCORE_O) $(ALL_GEN)) endif -# mac os x lsdlsrb2 does not like objcopy -ifndef MACOSX - $(OBJCOPY) $(BIN)/$(EXENAME) $(BIN)/$(DBGNAME) - $(OBJCOPY) --strip-debug $(BIN)/$(EXENAME) - -$(OBJCOPY) --add-gnu-debuglink=$(BIN)/$(DBGNAME) $(BIN)/$(EXENAME) -endif -ifndef NOUPX - -$(UPX) $(UPX_OPTS) $(BIN)/$(EXENAME) -endif -endif - -ifdef APPIMAGE - @echo Building AppImage... -ifdef APPIMAGE_NOASSETS - $(.)../AppImage_build.sh --small --quiet $(BIN)/ +info: +ifdef WINDOWSHELL + @REM else - $(.)../AppImage_build.sh -q $(BIN)/ -endif - @echo AppImage build complete, please look for $(EXENAME).AppImage in $(BIN) + @: endif - @echo Build is done, please look for $(EXENAME) in $(BIN), \(checking for post steps\) - -reobjdump: - @echo Redumping debugging info - $(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(DBGNAME) > $(BIN)/$(DBGNAME).txt - -$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt -ifndef WINDOWSHELL - -$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt -endif - -$(OBJDIR): - -$(MKDIR) $(OBJDIR) - -ifndef SDL -ifdef NOHW -dll : -else -dll : opengl_dll -endif -ifdef MINGW -all_dll: opengl_dll - -opengl_dll: $(BIN)/r_opengl.dll -$(BIN)/r_opengl.dll: $(OBJDIR)/ogl_win.o $(OBJDIR)/r_opengl.o - -$(MKDIR) $(BIN) - @echo Linking R_OpenGL.dll... - $(CC) --shared $^ -o $@ -g -Wl,--add-stdcall-alias -lgdi32 -static-libgcc -ifndef NOUPX - -$(UPX) $(UPX_OPTS) $@ -endif -endif - -else -ifdef SDL -ifdef MINGW -$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \ - doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_gl.h screen.h \ - command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \ - hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h hardware/hw_portal.h\ - hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \ - am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \ - p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ -else -$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \ - doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_gl.h screen.h \ - command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \ - hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h hardware/hw_portal.h \ - hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \ - am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \ - p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h - $(CC) $(CFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@ -endif -endif - -endif - -#dependecy made by gcc itself ! -$(OBJS): --include $(OBJDIR)/depend.dep - -$(OBJDIR)/depend.dep: - @echo "Creating dependency file, depend.dep" - @echo > comptime.h - -$(MKDIR) $(OBJDIR) - $(CC) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped - $(CC) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped -ifndef NOHW - $(CC) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped -endif - - $(CC) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped - - @sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep - $(REMOVE) $(OBJDIR)/depend.ped - @echo "Created dependency file, depend.dep" - -ifdef VALGRIND -$(OBJDIR)/z_zone.o: z_zone.c - $(CC) $(CFLAGS) $(WFLAGS) -DHAVE_VALGRIND $(VALGRIND_CFLAGS) -c $< -o $@ -endif - -$(OBJDIR)/comptime.o: comptime.c pre-build - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ - -$(BIN)/%.mo: locale/%.po - -$(MKDIR) $(BIN) - $(MSGFMT) -f -o $@ $< - -$(OBJDIR)/%.o: %.c - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ - -$(OBJDIR)/%.o: $(INTERFACE)/%.c - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ - -ifdef MACOSX -$(OBJDIR)/%.o: sdl/macosx/%.c - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ -endif - -$(OBJDIR)/%.o: hardware/%.c - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ - -$(OBJDIR)/%.o: blua/%.c - $(CC) $(CFLAGS) $(LUA_CFLAGS) $(WFLAGS) -c $< -o $@ - -$(OBJDIR)/%.o: %.s - $(CC) $(OPTS) -x assembler-with-cpp -c $< -o $@ - -$(OBJDIR)/SRB2.res: win32/Srb2win.rc win32/afxres.h win32/resource.h - $(WINDRES) -i $< -O rc $(WINDRESFLAGS) --include-dir=win32 -o $@ -O coff - -ifdef SDL -ifdef MINGW -$(OBJDIR)/win_dbg.o: win32/win_dbg.c - $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@ -endif -endif - -############################################################# -# -############################################################# +#$(warning The handwritten GNU Makefile for SRB2 is deprecated, and may be removed in the future. Please consider switching to CMake.) diff --git a/src/Makefile.d/dedicated.mk b/src/Makefile.d/dedicated.mk new file mode 100644 index 000000000..698ea5531 --- /dev/null +++ b/src/Makefile.d/dedicated.mk @@ -0,0 +1,24 @@ +makedir:=$(makedir)/Dedicated + +sources+=$(call List,dedicated/Sourcefile) + +opts+=-DDEDICATED + +ifdef FREEBSD +# on FreeBSD, we have to link to libpthread explicitly +libs+=-lpthread +endif + +ifdef MINGW +libs+=-mconsole +endif + +ifndef NOTHREADS +opts+=-DHAVE_THREADS +sources+=dedicated/i_threads.c +endif + +NOOPENMPT=1 +NOGME=1 +NOHW=1 +NOUPNP=1 diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk new file mode 100644 index 000000000..dd31d2f3e --- /dev/null +++ b/src/Makefile.d/detect.mk @@ -0,0 +1,124 @@ +# +# Detect the host system and compiler version. +# + +# Previously featured:\ + PANDORA\ + DUMMY\ + DJGPPDOS\ + SOLARIS\ + MACOSX\ + +all_systems:=\ + LINUX64\ + MINGW64\ + MINGW\ + UNIX\ + LINUX\ + FREEBSD\ + HAIKU\ + +# check for user specified system +ifeq (,$(filter $(all_systems),$(.VARIABLES))) +ifeq ($(OS),Windows_NT) # all windows are Windows_NT... + + ifeq ($(shell uname -s | grep -o MINGW64),MINGW64) # 64-bit MinGW + _m=Detected a Windows system,\ + compiling for 64-bit MinGW SDL...) + $(call Print,$(_m)) + MINGW64=1 + else # 32-bit MinGW + _m=Detected a Windows system,\ + compiling for 32-bit MinGW SDL...) + $(call Print,$(_m)) + MINGW=1 + endif + + NOOBJDUMP=1 +else # if you on the *nix + +system:=$(shell uname -s) + +ifeq ($(system),Linux) +new_system:=LINUX +else ifeq ($(system),Haiku) +new_system:=HAIKU +else + +$(error \ + Could not automatically detect your system,\ + try specifying a system manually) + +endif + +ifeq ($(shell getconf LONG_BIT),64) +system+=64-bit +new_system:=$(new_system)64 +endif + +$(call Print,Detected $(system) ($(new_system))...) +$(new_system):=1 + +endif +endif + +# This must have high to low order. +gcc_versions:=\ + 151 150 15\ + 142 141 140 14\ + 132 131 130 13\ + 123 122 121 120 12\ + 114 113 112 111 110 11\ + 105 104 103 102 101 100 10\ + 95 94 93 92 91 90\ + 85 84 83 82 81 80\ + 75 74 73 72 71 70\ + 64 63 62 61 60\ + 55 54 53 52 51 50\ + 49 48 47 46 45 44 43 42 41 40 + +latest_gcc_version:=15.1.1 + +# Automatically set version flag, but not if one was +# manually set. And don't bother if this is a clean only +# run. +ifeq (,$(call Wildvar,GCC% destructive)) + +# can't use $(CC) --version here since that uses argv[0] to display the name +# also gcc outputs the information to stderr, so I had to do 2>&1 +# this program really doesn't like identifying itself +shellversion:=$(shell $(CC) -v 2>&1) +# Try to remove "-win32" +version:=$(subst -win32,.0,$(shellversion)) + +# check if this is in fact GCC +ifneq (,$(findstring gcc version,$(version))) + +# in stark contrast to the name, gcc will give me a nicely formatted version number for free +shellversion:=$(shell $(CC) -dumpfullversion) + +# Try to remove "-win32" +version:=$(subst -win32,.0,$(shellversion)) + +# Turn version into words of major, minor +v:=$(subst ., ,$(version)) +# concat. major minor +v:=$(word 1,$(v))$(word 2,$(v)) + +# If this version is not in the list, +# default to the latest supported +ifeq (,$(filter $(v),$(gcc_versions))) +define line = +Your compiler version, GCC $(version), \ +is not supported by the Makefile. +The Makefile will assume GCC $(latest_gcc_version). +endef +$(call Print,$(line)) +GCC$(subst .,,$(latest_gcc_version)):=1 +else +$(call Print,Detected GCC $(version) (GCC$(v))) +GCC$(v):=1 +endif + +endif +endif diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk new file mode 100644 index 000000000..ca789dbee --- /dev/null +++ b/src/Makefile.d/features.mk @@ -0,0 +1,106 @@ +# +# Makefile for feature flags. +# + +passthru_opts+=\ + NOHW NOMD5 NOPOSTPROCESSING\ + MOBJCONSISTANCY PACKETDROP ZDEBUG\ + HAVE_MINIUPNPC\ + HAVE_DISCORDRPC DEVELOP\ + NOBLUAJIT + +# build with debugging information +ifdef DEBUGMODE +PACKETDROP=1 +opts+=-DPARANOIA -DRANGECHECK +endif + +ifndef NOHW +opts+=-DHWRENDER + +ifndef NOSCREENFBO +opts+=-DUSE_FBO_OGL +endif + +sources+=$(call List,hardware/Sourcefile) +endif + +ifndef NOMD5 +sources+=md5.c +endif + +ifndef NONET +ifndef NOSATURNJOIN +opts+=-DDOSATURNJOIN +endif +ifndef NOSATURNPAK +opts+=-DDOSATURNPAK +endif +endif + +ifndef NOZLIB +ifndef NOPNG +ifdef PNG_PKGCONFIG +$(eval $(call Use_pkg_config,PNG_PKGCONFIG)) +else +PNG_CONFIG?=$(call Prefix,libpng-config) +$(eval $(call Configure,PNG,$(PNG_CONFIG) \ + $(if $(PNG_STATIC),--static),,--ldflags)) +endif +ifdef LINUX +opts+=-D_LARGEFILE64_SOURCE +endif +opts+=-DHAVE_PNG +sources+=apng.c +endif +endif + +ifndef NOCURL +CURLCONFIG?=curl-config +$(eval $(call Configure,CURL,$(CURLCONFIG))) +opts+=-DHAVE_CURL +endif + +ifdef HAVE_MINIUPNPC +MINIUPNPC_PKGCONFIG?=miniupnpc +$(eval $(call Use_pkg_config,MINIUPNPC)) +HAVE_MINIUPNPC=1 +opts+=-DHAVE_MINIUPNPC +endif + +ifndef NOLIBBACKTRACE +$(eval $(call Propogate_flags,LIBBACKTRACE)) +libs+=-lbacktrace +opts+=-DHAVE_LIBBACKTRACE +endif + +#windoze hack +ifdef MINGW +ifndef NODISCORDRPC +HAVE_DISCORDRPC=1 +endif +endif + +ifdef HAVE_DISCORDRPC +$(eval $(call Propogate_flags,DISCORDRPC)) +libs+=-ldiscord-rpc +opts+=-DUSE_STUN +sources+=discord.c stun.c +endif + +# (Valgrind is a memory debugger.) +ifdef VALGRIND +VALGRIND_PKGCONFIG?=valgrind +VALGRIND_LDFLAGS= +$(eval $(call Use_pkg_config,VALGRIND)) +ZDEBUG=1 +opts+=-DHAVE_VALGRIND +endif + +default_packages:=\ + GME/libgme/LIBGME\ + OPENMPT/libopenmpt/LIBOPENMPT\ + ZLIB/zlib\ + +$(foreach p,$(default_packages),\ + $(eval $(call Check_pkg_config,$(p)))) diff --git a/src/Makefile.d/haiku.mk b/src/Makefile.d/haiku.mk new file mode 100644 index 000000000..6742ec75b --- /dev/null +++ b/src/Makefile.d/haiku.mk @@ -0,0 +1,71 @@ +# +# Makefile options for Haiku +# + +opts+=-DUNIXCOMMON -DLUA_USE_POSIX + +ifndef DEDICATED +ifndef DUMMY +SDL?=1 +DEDICATED?=0 +endif +endif + +NOEXECINFO=1 + +ifeq (${SDL},1) +EXENAME?=srb2haiku +else ifeq (${DEDICATED},1) +EXENAME?=srb2haikud +endif + +ifndef NONET +libs+=-lnetwork +endif + +define _set = +$(1)_CFLAGS?=$($(1)_opts) +$(1)_LDFLAGS?=$($(1)_libs) +endef + +lib:=../libs/gme +LIBGME_opts:=-I$(lib)/include +LIBGME_libs:=-l:libgme.so.0 +$(eval $(call _set,LIBGME)) + +lib:=../libs/libopenmpt +LIBOPENMPT_opts:=-I$(lib)/inc +LIBOPENMPT_libs:=-l:libopenmpt.so.0 +$(eval $(call _set,LIBOPENMPT)) + +ifdef SDL +lib:=../libs/SDL2_mixer +mixer_opts:=-I$(lib)/include +mixer_libs:=-l:libSDL2_mixer-2.0.so.0 + +lib:=../libs/SDL2 +SDL_opts:=-I$(lib)/include $(mixer_opts) +SDL_libs:=$(mixer_libs) -l:libSDL2-2.0.so.0 +$(eval $(call _set,SDL)) +endif + +lib:=../libs/zlib +ZLIB_opts:=-I$(lib) +ZLIB_libs:=-l:libz.so.1 +$(eval $(call _set,ZLIB)) + +ifndef PNG_CONFIG +PNG_opts:= +PNG_libs:=-l:libpng16.so.16 +$(eval $(call _set,PNG)) +endif + +lib:=../libs/curl +CURL_opts:=-I$(lib)/include +CURL_libs:=-l:libcurl.so.4 +$(eval $(call _set,CURL)) + +lib:=../libs/miniupnpc +MINIUPNPC_opts:=-I$(lib)/include +MINIUPNPC_libs:=-l:libminiupnpc.so.17 +$(eval $(call _set,MINIUPNPC)) diff --git a/src/Makefile.d/nix.mk b/src/Makefile.d/nix.mk new file mode 100644 index 000000000..7135f258b --- /dev/null +++ b/src/Makefile.d/nix.mk @@ -0,0 +1,47 @@ +# +# Makefile options for unices (linux, bsd...) +# + + +opts+=-DUNIXCOMMON -DLUA_USE_POSIX +# Use -rdynamic so a backtrace log shows function names +# instead of addresses +libs+=-lm -rdynamic + +ifndef NOHW +opts+=-I/usr/X11R6/include +libs+=-L/usr/X11R6/lib +endif + +ifndef DEDICATED +SDL?=1 +DEDICATED?=0 +endif + +ifeq (${SDL},1) +EXENAME?=lsdl2srb2kart +endif + +ifeq (${DEDICATED},1) +EXENAME?=lsrb2kartd +endif + +# In common usage. +ifdef LINUX +libs+=-lrt +passthru_opts+=NOTERMIOS +endif + +# Tested by Steel, as of release 2.2.8. +ifdef FREEBSD +opts+=-I/usr/X11R6/include -DLINUX -DFREEBSD +libs+=-L/usr/X11R6/lib -lkvm -lexecinfo +endif + +# FIXME: UNTESTED +#ifdef SOLARIS +#NOIPX=1 +#opts+=-I/usr/local/include -I/opt/sfw/include \ +# -DSOLARIS -DINADDR_NONE=INADDR_ANY -DBSD_COMP +#libs+=-L/opt/sfw/lib -lsocket -lnsl +#endif diff --git a/src/Makefile.d/old.mk b/src/Makefile.d/old.mk new file mode 100644 index 000000000..ec9b6d776 --- /dev/null +++ b/src/Makefile.d/old.mk @@ -0,0 +1,16 @@ +# +# Warn about old build directories and offer to purge. +# + +_old:=$(wildcard $(addprefix ../bin/,FreeBSD Linux \ + Linux64 Mingw Mingw64 SDL dummy) ../objs ../dep) + +ifdef _old +$(foreach v,$(_old),$(info $(abspath $(v)))) +$(info ) +$(info These directories are no longer\ + required and should be removed.) +$(info You may remove them manually or\ + by using 'make distclean') +$(error ) +endif diff --git a/src/Makefile.d/platform.mk b/src/Makefile.d/platform.mk new file mode 100644 index 000000000..d5423a397 --- /dev/null +++ b/src/Makefile.d/platform.mk @@ -0,0 +1,76 @@ +# +# Platform specific options. +# + +PKG_CONFIG?=pkg-config + +ifdef WINDOWSHELL +rmrf=-2>NUL DEL /S /Q +mkdir=-2>NUL MD +cat=TYPE +else +rmrf=rm -rf +mkdir=mkdir -p +cat=cat +endif + +ifdef LINUX64 +LINUX=1 +endif + +ifdef MINGW64 +MINGW=1 +endif + +ifdef LINUX +UNIX=1 +ifdef LINUX64 +NONX86=1 +# LINUX64 does not imply X86_64=1; +# could mean ARM64 or Itanium +platform=linux/64 +else +platform=linux +endif +else ifdef FREEBSD +UNIX=1 +platform=freebsd +else ifdef HAIKU +# Give Haiku its own configuration, since it +# isn't actually UNIX. +include Makefile.d/haiku.mk +else ifdef SOLARIS # FIXME: UNTESTED +UNIX=1 +platform=solaris +else ifdef CYGWIN32 # FIXME: UNTESTED +platform=cygwin +else ifdef MINGW +ifdef MINGW64 +NONX86=1 +NOASM=1 +# MINGW64 should not necessarily imply X86_64=1, +# but we make that assumption elsewhere +# Once that changes, remove this +X86_64=1 +platform=mingw/64 +else +platform=mingw +endif +include Makefile.d/win32.mk +endif + +ifdef platform +makedir:=$(makedir)/$(platform) +endif + +ifdef UNIX +include Makefile.d/nix.mk +endif + +ifeq ($(SDL), 1) +include Makefile.d/sdl.mk +else ifeq ($(DEDICATED), 1) +include Makefile.d/dedicated.mk +else +include Makefile.d/dummy.mk +endif diff --git a/src/Makefile.d/sdl.mk b/src/Makefile.d/sdl.mk new file mode 100644 index 000000000..9f2074d9d --- /dev/null +++ b/src/Makefile.d/sdl.mk @@ -0,0 +1,71 @@ +# +# Makefile options for SDL2 backend. +# + +# +# SDL...., *looks at Alam*, THIS IS A MESS! +# +# ...a little bird flexes its muscles... +# + +makedir:=$(makedir)/SDL + +sources+=$(call List,sdl/Sourcefile) +opts+=-DDIRECTFULLSCREEN -DHAVE_SDL + +NOUPNP=1 + +# FIXME: UNTESTED +#ifdef PANDORA +#include sdl/SRB2Pandora/Makefile.cfg +#endif #ifdef PANDORA + +# FIXME: UNTESTED +#ifdef CYGWIN32 +#include sdl/MakeCYG.cfg +#endif #ifdef CYGWIN32 + +ifndef NOHW +sources+=sdl/ogl_sdl.c +endif + +ifdef NOMIXER +sources+=sdl/sdl_sound.c +else +opts+=-DHAVE_MIXER +sources+=sdl/mixer_sound.c + + ifndef HAIKU # Haiku has a special import path + libs+=-lSDL2_mixer + endif +endif + +ifndef NOTHREADS +opts+=-DHAVE_THREADS +sources+=sdl/i_threads.c +endif + +ifdef SDL_PKGCONFIG +$(eval $(call Use_pkg_config,SDL)) +else +SDL_CONFIG?=$(call Prefix,sdl2-config) +SDL_CFLAGS?=$(shell $(SDL_CONFIG) --cflags) +SDL_LDFLAGS?=$(shell $(SDL_CONFIG) \ + $(if $(STATIC),--static-libs,--libs)) +$(eval $(call Propogate_flags,SDL)) +endif + +ifdef MINGW +ifndef NOSDLMAIN +SDLMAIN=1 +endif +endif + +ifdef SDLMAIN +opts+=-DSDLMAIN +else +ifdef MINGW +opts+=-Umain +libs+=-mconsole +endif +endif diff --git a/src/Makefile.d/util.mk b/src/Makefile.d/util.mk new file mode 100644 index 000000000..bda68df13 --- /dev/null +++ b/src/Makefile.d/util.mk @@ -0,0 +1,93 @@ +# +# Utility macros for the rest of the Makefiles. +# + +Ifnot=$(if $(1),$(3),$(2)) +Ifndef=$(call Ifnot,$($(1)),$(2),$(3)) + +# Match and expand a list of variables by pattern. +Wildvar=$(foreach v,$(filter $(1),$(.VARIABLES)),$($(v))) + +# Read a list of words from file and prepend each with the +# directory of the file. +_cat=$(shell $(cat) $(call Windows_path,$(1))) +List=$(addprefix $(dir $(1)),$(call _cat,$(1))) + +# Convert path separators to backslash on Windows. +Windows_path=$(if $(WINDOWSHELL),$(subst /,\,$(1)),$(1)) + +define Propogate_flags = +opts+=$$($(1)_CFLAGS) +libs+=$$($(1)_LDFLAGS) +endef + +# Set library's _CFLAGS and _LDFLAGS from some command. +# Automatically propogates the flags too. +# 1: variable prefix (e.g. CURL) +# 2: start of command (e.g. curl-config) +# --- optional ---- +# 3: CFLAGS command arguments, default '--cflags' +# 4: LDFLAGS command arguments, default '--libs' +# 5: common command arguments at the end of command +define Configure = +$(1)_CFLAGS?=$$(shell $(2) $(or $(3),--cflags) $(5)) +$(1)_LDFLAGS?=$$(shell $(2) $(or $(4),--libs) $(5)) +$(call Propogate_flags,$(1)) +endef + +# Configure library with pkg-config. The package name is +# taken from a _PKGCONFIG variable. +# 1: variable prefix +# +# LIBGME_PKGCONFIG=libgme +# $(eval $(call Use_pkg_config,LIBGME)) +define Use_pkg_config = +$(call Configure,$(1),$(PKG_CONFIG),,,$($(1)_PKGCONFIG)) +endef + +# Check disabling flag and configure package in one step +# according to delimited argument. +# (There is only one argument, but it split by slash.) +# 1/: short form library name (uppercase). This is +# prefixed with 'NO' and 'HAVE_'. E.g. NOGME, HAVE_GME +# /2: package name (e.g. libgme) +# /3: variable prefix +# +# The following example would check if NOGME is not +# defined before attempting to define LIBGME_CFLAGS and +# LIBGME_LDFLAGS as with Use_pkg_config. +# +# $(eval $(call Check_pkg_config,GME/libgme/LIBGME)) +define Check_pkg_config = +_p:=$(subst /, ,$(1)) +_v1:=$$(word 1,$$(_p)) +_v2:=$$(or $$(word 3,$$(_p)),$$(_v1)) +ifndef NO$$(_v1) +$$(_v2)_PKGCONFIG?=$$(word 2,$$(_p)) +$$(eval $$(call Use_pkg_config,$$(_v2))) +opts+=-DHAVE_$$(_v1) +endif +endef + +# $(call Prefix,gcc) +Prefix=$(if $(PREFIX),$(PREFIX)-)$(1) + +Echo= +Echo_name= +Print= + +ifndef SILENT +Echo=@echo $(1) +ifndef ECHO +ifndef NOECHOFILENAMES +Echo_name=$(call Echo,-- $(1) ...) +endif +endif +ifndef MAKE_RESTARTS +ifndef destructive +Print=$(info $(1)) +endif +endif +endif + +.=$(call Ifndef,ECHO,@) diff --git a/src/Makefile.d/versions.mk b/src/Makefile.d/versions.mk new file mode 100644 index 000000000..7c130d908 --- /dev/null +++ b/src/Makefile.d/versions.mk @@ -0,0 +1,174 @@ +# +# Flags to put a sock in GCC! +# + +# See the versions list in detect.mk +# This will define all version flags going backward. +# Yes, it's magic. +define _predecessor = +ifdef GCC$(firstword $(1)) +GCC$(lastword $(1)):=1 +endif +endef +_n:=$(words $(gcc_versions)) +$(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\ + $(addprefix =,$(wordlist 2,$(_n),$(gcc_versions)))),\ + $(and $(findstring =,$(v)),\ + $(eval $(call _predecessor,$(subst =, ,$(v)))))) + +# -W -Wno-unused +WFLAGS:=-Wall -Wno-trigraphs +ifndef GCC295 +#WFLAGS+=-Wno-packed +endif +ifndef RELAXWARNINGS + WFLAGS+=-W +#WFLAGS+=-Wno-sign-compare +ifndef GCC295 + WFLAGS+=-Wno-div-by-zero +endif +#WFLAGS+=-Wsystem-headers +WFLAGS+=-Wfloat-equal +#WFLAGS+=-Wtraditional + WFLAGS+=-Wundef +ifndef GCC295 + WFLAGS+=-Wendif-labels +endif +ifdef GCC41 + WFLAGS+=-Wshadow +endif +#WFLAGS+=-Wlarger-than-%len% + WFLAGS+=-Wpointer-arith -Wbad-function-cast +ifdef GCC45 +#WFLAGS+=-Wc++-compat +endif + WFLAGS+=-Wcast-qual +ifndef NOCASTALIGNWARN + WFLAGS+=-Wcast-align +endif + WFLAGS+=-Wwrite-strings +ifndef ERRORMODE +#WFLAGS+=-Wconversion +ifdef GCC43 + #WFLAGS+=-Wno-sign-conversion +endif +endif + WFLAGS+=-Wsign-compare +ifdef GCC91 + WFLAGS+=-Wno-error=address-of-packed-member +endif +ifdef GCC45 + WFLAGS+=-Wlogical-op +endif + WFLAGS+=-Waggregate-return +ifdef HAIKU +ifdef GCC41 + #WFLAGS+=-Wno-attributes +endif +endif +#WFLAGS+=-Wstrict-prototypes +ifdef GCC40 + WFLAGS+=-Wold-style-definition +endif + WFLAGS+=-Wmissing-prototypes -Wmissing-declarations +ifdef GCC40 + WFLAGS+=-Wmissing-field-initializers +endif + WFLAGS+=-Wmissing-noreturn +#WFLAGS+=-Wmissing-format-attribute +#WFLAGS+=-Wno-multichar +#WFLAGS+=-Wno-deprecated-declarations +#WFLAGS+=-Wpacked +#WFLAGS+=-Wpadded +#WFLAGS+=-Wredundant-decls + WFLAGS+=-Wnested-externs +#WFLAGS+=-Wunreachable-code + WFLAGS+=-Winline +ifdef DEBUGMODE + WFLAGS+=-Wno-error=inline +endif +ifdef GCC43 + WFLAGS+=-funit-at-a-time + WFLAGS+=-Wlogical-op +endif +ifndef GCC295 + WFLAGS+=-Wdisabled-optimization +endif +endif +WFLAGS+=-Wformat-y2k +ifdef GCC71 +WFLAGS+=-Wno-error=format-overflow=2 +endif +WFLAGS+=-Wformat-security +ifndef GCC29 +#WFLAGS+=-Winit-self +endif +ifdef GCC46 +WFLAGS+=-Wno-suggest-attribute=noreturn +endif + +ifdef NOLDWARNING +LDFLAGS+=-Wl,--as-needed +endif + +ifdef ERRORMODE +WFLAGS+=-Werror +endif + +ifdef GCC43 + #WFLAGS+=-Wno-error=clobbered +endif +ifdef GCC44 +#WFLAGS+=-Wno-error=array-bounds +endif +ifdef GCC46 + WFLAGS+=-Wno-error=suggest-attribute=noreturn +endif +ifdef GCC54 + WFLAGS+=-Wno-logical-op -Wno-error=logical-op +endif +ifdef GCC61 + WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare +endif +ifdef GCC71 + WFLAGS+=-Wimplicit-fallthrough=4 +endif +ifdef GCC81 + WFLAGS+=-Wno-error=format-overflow + WFLAGS+=-Wno-format-overflow + WFLAGS+=-Wno-error=multistatement-macros +endif + +ifdef NONX86 + ifdef X86_64 # yeah that SEEMS contradictory + opts+=-march=nocona + endif +else + ifndef GCC29 + opts+=-msse3 -mfpmath=sse + else + opts+=-mpentium + endif +endif + +ifdef DEBUGMODE +ifdef GCC48 +opts+=-Og +else +opts+=-O0 +endif +endif + +ifdef VALGRIND +ifdef GCC46 +WFLAGS+=-Wno-error=unused-but-set-variable +WFLAGS+=-Wno-unused-but-set-variable +endif +endif + +# Lua +ifdef GCC43 +ifndef GCC44 +WFLAGS+=-Wno-logical-op +endif +endif diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk new file mode 100644 index 000000000..353c666ee --- /dev/null +++ b/src/Makefile.d/win32.mk @@ -0,0 +1,124 @@ +# +# Mingw, if you don't know, that's Win32/Win64 +# + +ifndef MINGW64 +EXENAME?=srb2kart-saturn_32bit.exe +else +EXENAME?=srb2kart-saturn_64bit.exe +endif + +# disable dynamicbase if under msys2 +ifdef MSYSTEM +libs+=-Wl,--disable-dynamicbase +endif + +sources+=win32/Srb2win.rc +opts+=-DSTDC_HEADERS +libs+=-ladvapi32 -lkernel32 -lmsvcrt -luser32 + +ifndef DEDICATED +ifndef DUMMY +SDL?=1 +endif +endif + +ifndef NOHW +opts+=-DUSE_WGL_SWAP +endif + +ifdef MINGW64 +libs+=-lws2_32 +else +#ifndef HAVE_IPV6 +#libs+=-lwsock32 +#else +libs+=-lws2_32 +#endif +endif + +ifndef MINGW64 +libs+=--large-address-aware +NOLIBBACKTRACE=1 +endif + +ifndef MINGW64 +32=32 +x86=x86 +i686=i686 +else +32=64 +x86=x86_64 +i686=x86_64 +endif + +mingw:=$(i686)-w64-mingw32 + +define _set = +$(1)_CFLAGS?=$($(1)_opts) +$(1)_LDFLAGS?=$($(1)_libs) +endef + +lib:=../libs/gme +LIBGME_opts:=-I$(lib)/include +LIBGME_libs:=-L$(lib)/win$(32) -lgme +$(eval $(call _set,LIBGME)) + +lib:=../libs/libopenmpt +LIBOPENMPT_opts:=-I$(lib)/inc +LIBOPENMPT_libs:=-L$(lib)/lib/$(x86)/mingw -lopenmpt +$(eval $(call _set,LIBOPENMPT)) + +lib:=../libs/SDL2_mixer/$(mingw) + +ifdef SDL +mixer_opts:=-I$(lib)/include/SDL2 +mixer_libs:=-L$(lib)/lib + +lib:=../libs/SDL2/$(mingw) +SDL_opts:=-I$(lib)/include/SDL2\ + $(mixer_opts) -Dmain=SDL_main +SDL_libs:=-L$(lib)/lib $(mixer_libs)\ + -lmingw32 -lSDL2main -lSDL2 -mwindows +$(eval $(call _set,SDL)) +endif + +ifdef MINGW64 +lib:=../libs/libbacktrace +LIBBACKTRACE_opts:=-I$(lib)/include +LIBBACKTRACE_libs:=-L$(lib)/lib/x86_64 -lbacktrace +$(eval $(call _set,LIBBACKTRACE)) +else +lib:=../libs/drmingw +opts+=-I$(lib)/include +libs+=-L$(lib)/lib/win32 -lmgwhelp -lexchndl +endif + +lib:=../libs/zlib +ZLIB_opts:=-I$(lib) +ZLIB_libs:=-L$(lib)/win32 -l:libz$(32).a +$(eval $(call _set,ZLIB)) + +ifndef PNG_CONFIG +lib:=../libs/libpng-src +PNG_opts:=-I$(lib) +PNG_libs:=-L$(lib)/projects -lpng$(32) +$(eval $(call _set,PNG)) +endif + +lib:=../libs/curl +CURL_opts:=-I$(lib)/include +CURL_libs:=-L$(lib)/lib$(32) -lcurl +$(eval $(call _set,CURL)) + +ifndef MINGW64 # miniupnc is broken with MINGW64 +lib:=../libs/miniupnpc +MINIUPNPC_opts:=-I$(lib)/include -DMINIUPNP_STATICLIB +MINIUPNPC_libs:=-L$(lib)/mingw$(32) -lminiupnpc -lws2_32 -liphlpapi +$(eval $(call _set,MINIUPNPC)) +endif + +lib:=../libs/discord-rpc/win$(32)-dynamic +DISCORDRPC_opts+=-I$(lib)/include +DISCORDRPC_libs+=-L$(lib)/lib -ldiscord-rpc +$(eval $(call _set,DISCORDRPC)) diff --git a/src/Sourcefile b/src/Sourcefile new file mode 100644 index 000000000..4d117111d --- /dev/null +++ b/src/Sourcefile @@ -0,0 +1,97 @@ +am_map.c +b_bot.c +command.c +console.c +d_clisrv.c +d_main.c +d_net.c +d_netcmd.c +d_netfil.c +d_protocol.c +dehacked.c +f_finale.c +f_wipe.c +filesrch.c +g_game.c +g_input.c +hu_stuff.c +i_tcp.c +i_time.c +info.c +lzf.c +m_aatree.c +m_anigif.c +m_argv.c +m_bbox.c +m_cheat.c +m_cond.c +m_fixed.c +m_menu.c +m_textinput.c +m_misc.c +m_perfstats.c +m_queue.c +m_random.c +mserv.c +http-mserv.c +qs22j.c +s_sound.c +screen.c +sounds.c +st_stuff.c +string.c +tables.c +v_video.c +w_wad.c +y_inter.c +z_zone.c +r_bsp.c +r_data.c +r_draw.c +r_fps.c +r_main.c +r_patch.c +r_patchrotation.c +r_plane.c +r_segs.c +r_sky.c +r_splats.c +r_things.c +r_portal.c +p_ceilng.c +p_enemy.c +p_floor.c +p_inter.c +p_lights.c +p_map.c +p_maputl.c +p_mobj.c +p_polyobj.c +p_saveg.c +p_setup.c +p_sight.c +p_slopes.c +p_spec.c +p_telept.c +p_tick.c +p_user.c +k_director.c +k_kart.c +k_stats.c +lua_baselib.c +lua_blockmaplib.c +lua_consolelib.c +lua_hooklib.c +lua_hudlib.c +lua_hudlib_drawlist.c +lua_infolib.c +lua_maplib.c +lua_mathlib.c +lua_mobjlib.c +lua_playerlib.c +lua_script.c +lua_skinlib.c +lua_thinkerlib.c +lua_udatalib.c +lua_glib.c +hashtable.c diff --git a/src/blua/Sourcefile b/src/blua/Sourcefile new file mode 100644 index 000000000..da89f45a4 --- /dev/null +++ b/src/blua/Sourcefile @@ -0,0 +1,26 @@ +lapi.c +lauxlib.c +lbaselib.c +ldblib.c +lcode.c +ldebug.c +ldo.c +ldump.c +lfunc.c +lgc.c +linit.c +liolib.c +llex.c +lmem.c +lobject.c +lopcodes.c +lparser.c +lstate.c +lstring.c +lstrlib.c +ltable.c +ltablib.c +ltm.c +lundump.c +lvm.c +lzio.c diff --git a/src/d_main.c b/src/d_main.c index 728a1a760..79e06285e 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1607,7 +1607,9 @@ void D_SRB2Main(void) #endif // for dedicated server +#if !defined (DEDICATED) dedicated = M_CheckParm("-dedicated") != 0; +#endif strcpy(title, "SRB2Kart"); strcpy(srb2, "SRB2Kart"); diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 5b8a8c18b..cf72835db 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -305,14 +305,12 @@ consvar_t cv_verticallook[MAXSPLITSCREENPLAYERS] = { {"verticallook4", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL} }; -#if defined(HAVE_SDL) || defined(_WINDOWS) //joystick 1 and 2 consvar_t cv_usejoystick[MAXSPLITSCREENPLAYERS] = { {"use_joystick", "1", CV_SAVE|CV_CALL, NULL, I_InitJoystick1, 0, NULL, NULL, 0, 0, NULL}, {"use_joystick2", "2", CV_SAVE|CV_CALL, NULL, I_InitJoystick2, 0, NULL, NULL, 0, 0, NULL}, {"use_joystick3", "3", CV_SAVE|CV_CALL, NULL, I_InitJoystick3, 0, NULL, NULL, 0, 0, NULL}, {"use_joystick4", "4", CV_SAVE|CV_CALL, NULL, I_InitJoystick4, 0, NULL, NULL, 0, 0, NULL} }; -#endif #if defined (HAVE_SDL) consvar_t cv_joyscale[MAXSPLITSCREENPLAYERS] = { diff --git a/src/dedicated/CMakeLists.txt b/src/dedicated/CMakeLists.txt new file mode 100644 index 000000000..36f670251 --- /dev/null +++ b/src/dedicated/CMakeLists.txt @@ -0,0 +1,108 @@ +# Declare dedicated interface sources + +target_sourcefile(c) + +target_sources(SRB2SDL2 PRIVATE) + +if(${CMAKE_SYSTEM} MATCHES Windows) + target_sources(SRB2SDL2 PRIVATE + ../win32/win_dbg.c + ../win32/Srb2win.rc) +endif() + +if(${CMAKE_SYSTEM} MATCHES Windows) + set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy) +elseif(${CMAKE_SYSTEM} MATCHES Linux) + set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsrb2dlegacy) +else() + set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy) +endif() + +if(${CMAKE_SYSTEM} MATCHES Darwin) + find_library(CORE_LIB CoreFoundation) + target_link_libraries(SRB2SDL2 PRIVATE + ${CORE_LIB} + ${PNG_LIBRARIES} + ${ZLIB_LIBRARIES} + ) + set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}") +else() + target_link_libraries(SRB2SDL2 PRIVATE + ${PNG_LIBRARIES} + ${ZLIB_LIBRARIES} + ) + + if(${CMAKE_SYSTEM} MATCHES Linux) + target_link_libraries(SRB2SDL2 PRIVATE + m + rt + ) + endif() +endif() + +#target_link_libraries(SRB2SDL2 PRIVATE SRB2Core) + +set_target_properties(SRB2SDL2 PROPERTIES VERSION ${SRB2_VERSION}) + +if(${CMAKE_SYSTEM} MATCHES Windows) + target_link_libraries(SRB2SDL2 PRIVATE + ws2_32 + ) + target_compile_options(SRB2SDL2 PRIVATE + -U_WINDOWS + ) +endif() + +target_include_directories(SRB2SDL2 PRIVATE + ${PNG_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIRS} +) + +target_compile_definitions(SRB2SDL2 PRIVATE + -DDEDICATED +) + +## strip debug symbols into separate file when using gcc +if(CMAKE_COMPILER_IS_GNUCC) + if(${CMAKE_BUILD_TYPE} MATCHES Debug) + message(STATUS "Will make separate debug symbols in *.debug") + add_custom_command(TARGET SRB2SDL2 POST_BUILD + COMMAND ${OBJCOPY} --only-keep-debug $ $.debug + COMMAND ${OBJCOPY} --strip-debug $ + COMMAND ${OBJCOPY} --add-gnu-debuglink=$.debug $ + ) + endif() +endif() + +#### Installation #### +if(${CMAKE_SYSTEM} MATCHES Darwin) + install(TARGETS SRB2SDL2 + BUNDLE DESTINATION . + ) +else() + install(TARGETS SRB2SDL2 SRB2SDL2 + RUNTIME DESTINATION . + ) +endif() + +# Mac bundle fixup +# HACK: THIS IS IMPORTANT! See the escaped \${CMAKE_INSTALL_PREFIX}? This +# makes it so that var is evaluated LATER during cpack, not right now! +# This fixes the quirk where the bundled libraries don't land in the final package +# https://cmake.org/pipermail/cmake/2011-March/043532.html +# +# HOWEVER: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY} is NOT escaped, because that var +# is only available to us at this step. Read the link: ${CMAKE_INSTALL_PREFIX} at +# this current step points to the CMAKE build folder, NOT the folder that CPACK uses. +# Therefore, it makes sense to escape that var, but not the other. +if(${CMAKE_SYSTEM} MATCHES Darwin) + install(CODE " + include(BundleUtilities) + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${CPACK_PACKAGE_DESCRIPTION_SUMMARY}.app\" + \"\" + /Library/Frameworks + )" + ) +endif() + +set(SRB2_SDL2_AVAILABLE YES PARENT_SCOPE) diff --git a/src/dedicated/Sourcefile b/src/dedicated/Sourcefile new file mode 100644 index 000000000..176e60a96 --- /dev/null +++ b/src/dedicated/Sourcefile @@ -0,0 +1,7 @@ +i_system.c +i_main.c +i_video.c +i_sound.c +i_threads.c +dosstr.c +endtxt.c diff --git a/src/dedicated/dosstr.c b/src/dedicated/dosstr.c new file mode 100644 index 000000000..f9bbee9b4 --- /dev/null +++ b/src/dedicated/dosstr.c @@ -0,0 +1,38 @@ +// Emacs style mode select -*- C++ -*- +//----------------------------------------------------------------------------- +// +// This file is in the public domain. +// (Re)written by Graue in 2006. +// +//----------------------------------------------------------------------------- +/// \file +/// \brief String uppercasing/lowercasing functions for non-DOS non-Win32 +/// systems + +#include "../doomtype.h" + +#ifndef HAVE_DOSSTR_FUNCS + +#include + +int strupr(char *n) +{ + while (*n != '\0') + { + *n = toupper(*n); + n++; + } + return 1; +} + +int strlwr(char *n) +{ + while (*n != '\0') + { + *n = tolower(*n); + n++; + } + return 1; +} + +#endif diff --git a/src/dedicated/endtxt.c b/src/dedicated/endtxt.c new file mode 100644 index 000000000..1e72ca9a8 --- /dev/null +++ b/src/dedicated/endtxt.c @@ -0,0 +1,234 @@ +/* + * Function to write the SRB2 end message text + * + * Copyright (C) 1998 by Udo Munk + * + * This code is provided AS IS and there are no guarantees, none. + * Feel free to share and modify. + */ +//----------------------------------------------------------------------------- +/// \file +/// \brief Support to show ENDOOM text +/// +/// Loads the lump ENDOOM, set up the console to print +/// out the colors and text + +#include +#include + +// need this 19990118 by Kin +#include "../doomdef.h" +#include "../w_wad.h" +#include "../z_zone.h" +#include "endtxt.h" +/** \brief The ShowEndTxt function + + + Prints out the ENDOOM the way DOOM.EXE/DOOM2.EXE did for Win32 or Linux/GNU + + \return void + + +*/ + +void ShowEndTxt(void) +{ + INT32 i; + UINT16 j, att = 0; + INT32 nlflag = 1; +#ifdef _WIN32 + HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE); + DWORD mode, bytesWritten; + CONSOLE_SCREEN_BUFFER_INFO backupcon; + COORD resizewin = {80,-1}; + CHAR let = 0; +#endif + UINT16 *ptext; + void *data; + lumpnum_t endoomnum = W_GetNumForName("ENDOOM"); + //char *col; + + /* if the xterm has more then 80 columns we need to add nl's */ + /* doesn't work, COLUMNS is not in the environment at this time ??? + col = I_getenv("COLUMNS"); + if (col) { + if (atoi(col) > 80) + nlflag++; + } + */ + + /* get the lump with the text */ + data = ptext = W_CacheLumpNum(endoomnum, PU_CACHE); + +#ifdef _WIN32 + if (co == INVALID_HANDLE_VALUE || GetFileType(co) != FILE_TYPE_CHAR || !GetConsoleMode(co, &mode)) // test if it a good handle + { + Z_Free(data); + return; + } + + backupcon.wAttributes = FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE; // Just in case + GetConsoleScreenBufferInfo(co, &backupcon); //Store old state + resizewin.Y = backupcon.dwSize.Y; + if (backupcon.dwSize.X < resizewin.X) + SetConsoleScreenBufferSize(co, resizewin); + + for (i=1; i<=80*25; i++) // print 80x25 text and deal with the attributes too + { + j = (UINT16)(*ptext >> 8); // attribute first + let = (char)(*ptext & 0xff); // text second + if (j != att) // attribute changed? + { + att = j; // save current attribute + SetConsoleTextAttribute(co, j); //set fg and bg color for buffer + } + + WriteConsoleA(co, &let, 1, &bytesWritten, NULL); // now the text + + if (nlflag && !(i % 80) && backupcon.dwSize.X > resizewin.X) // do we need a nl? + { + att = backupcon.wAttributes; + SetConsoleTextAttribute(co, att); // all attributes off + WriteConsoleA(co, "\n", 1, &bytesWritten, NULL); // newline to console + } + ptext++; + } + SetConsoleTextAttribute(co, backupcon.wAttributes); // all attributes off +#else + /* print 80x25 text and deal with the attributes too */ + for (i=1; i<=80*25; i++) { + /* attribute first */ + /* attribute changed? */ + if ((j = *ptext >> 8) != att) { + /* save current attribute */ + att = j; + /* set new attribute, forground color first */ + printf("\033["); + switch (j & 0x0f) { + case 0: /* black */ + printf("30"); + break; + case 1: /* blue */ + printf("34"); + break; + case 2: /* green */ + printf("32"); + break; + case 3: /* cyan */ + printf("36"); + break; + case 4: /* red */ + printf("31"); + break; + case 5: /* magenta */ + printf("35"); + break; + case 6: /* brown */ + printf("33"); + break; + case 7: /* bright grey */ + printf("37"); + break; + case 8: /* dark grey */ + printf("1;30"); + break; + case 9: /* bright blue */ + printf("1;34"); + break; + case 10: /* bright green */ + printf("1;32"); + break; + case 11: /* bright cyan */ + printf("1;36"); + break; + case 12: /* bright red */ + printf("1;31"); + break; + case 13: /* bright magenta */ + printf("1;35"); + break; + case 14: /* yellow */ + printf("1;33"); + break; + case 15: /* white */ + printf("1;37"); + break; + } + printf("m"); + /* now background color */ + printf("\033["); + switch ((j >> 4) & 0x0f) { + case 0: /* black */ + printf("40"); + break; + case 1: /* blue */ + printf("44"); + break; + case 2: /* green */ + printf("42"); + break; + case 3: /* cyan */ + printf("46"); + break; + case 4: /* red */ + printf("41"); + break; + case 5: /* magenta */ + printf("45"); + break; + case 6: /* brown */ + printf("43"); + break; + case 7: /* bright grey */ + printf("47"); + break; + case 8: /* dark grey */ + printf("1;40"); + break; + case 9: /* bright blue */ + printf("1;44"); + break; + case 10: /* bright green */ + printf("1;42"); + break; + case 11: /* bright cyan */ + printf("1;46"); + break; + case 12: /* bright red */ + printf("1;41"); + break; + case 13: /* bright magenta */ + printf("1;45"); + break; + case 14: /* yellow */ + printf("1;43"); + break; + case 15: /* white */ + printf("1;47"); + break; + } + printf("m"); + } + + /* now the text */ + printf("%c",*ptext++ & 0xff); + + /* do we need a nl? */ + if (nlflag) + { + if (!(i % 80)) + { + printf("\033[0m"); + att = 0; + printf("\n"); + } + } + } + /* all attributes off */ + printf("\033[0m"); +#endif + if (nlflag) + printf("\n"); + + Z_Free(data); +} diff --git a/src/dedicated/endtxt.h b/src/dedicated/endtxt.h new file mode 100644 index 000000000..41f8e51ad --- /dev/null +++ b/src/dedicated/endtxt.h @@ -0,0 +1,24 @@ +// Emacs style mode select -*- C++ -*- +//----------------------------------------------------------------------------- +// +// Copyright (C) 1998-2000 by DooM Legacy Team. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//----------------------------------------------------------------------------- +/// \file +/// \brief Support to show ENDOOM text + +#ifndef __ENDTXT__ +#define __ENDTXT__ + +void ShowEndTxt (void); + +#endif diff --git a/src/dedicated/i_main.c b/src/dedicated/i_main.c new file mode 100644 index 000000000..911e356d0 --- /dev/null +++ b/src/dedicated/i_main.c @@ -0,0 +1,238 @@ +// Emacs style mode select -*- C++ -*- +//----------------------------------------------------------------------------- +// +// Copyright (C) 1993-1996 by id Software, Inc. +// Copyright (C) 1998-2000 by DooM Legacy Team. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//----------------------------------------------------------------------------- +/// \file +/// \brief Main program, simply calls D_SRB2Main and D_SRB2Loop, the high level loop. + +#include "../doomdef.h" +#include "../m_argv.h" +#include "../d_main.h" +#include "../m_misc.h" /* path shit */ +#include "../i_system.h" +#include "../d_clisrv.h" + +#if defined (__GNUC__) || defined (__unix__) +#include +#endif + +#ifdef __unix__ +#include +#endif + +#include "time.h" // For log timestamps + +#ifdef HAVE_TTF +#include "i_ttf.h" +#endif + +#ifdef HAVE_LIBBACKTRACE +#include + +struct backtrace_state *bt_state = NULL; +#endif + +#ifdef LOGMESSAGES +FILE *logstream = NULL; +char logfilename[1024]; +#endif + +#ifndef DOXYGEN +#ifndef O_TEXT +#define O_TEXT 0 +#endif + +#ifndef O_SEQUENTIAL +#define O_SEQUENTIAL 0 +#endif +#endif + +#ifdef _WIN32 +#ifndef _AMD64_ +#include "exchndl.h" +#define DRMINGW +#endif +#endif + +#if defined (_WIN32) +#include "../win32/win_dbg.h" +typedef BOOL (WINAPI *p_IsDebuggerPresent)(VOID); +#endif + +#ifdef _WIN32 +static void +ChDirToExe (void) +{ + CHAR path[MAX_PATH]; + if (GetModuleFileNameA(NULL, path, MAX_PATH) > 0) + { + strrchr(path, '\\')[0] = '\0'; + SetCurrentDirectoryA(path); + } +} +#endif + +/** \brief The main function + + \param argc number of arg + \param *argv string table + + \return int +*/ +#if defined (__GNUC__) && (__GNUC__ >= 4) +#pragma GCC diagnostic ignored "-Wmissing-noreturn" +#endif + +#ifdef LOGMESSAGES +static void InitLogging(void) +{ + const char *logdir = NULL; + time_t my_time; + struct tm * timeinfo; + const char *format; + const char *reldir; + int left; + boolean fileabs; +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) + const char *link; +#endif + + logdir = D_Home(); + + my_time = time(NULL); + timeinfo = localtime(&my_time); + + if (M_CheckParm("-logfile") && M_IsNextParm()) + { + format = M_GetNextParm(); + fileabs = M_IsPathAbsolute(format); + } + else + { + format = "log-%Y-%m-%d_%H-%M-%S.txt"; + fileabs = false; + } + + if (fileabs) + { + strftime(logfilename, sizeof logfilename, format, timeinfo); + } + else + { + if (M_CheckParm("-logdir") && M_IsNextParm()) + reldir = M_GetNextParm(); + else + reldir = "logs"; + + if (M_IsPathAbsolute(reldir)) + { + left = snprintf(logfilename, sizeof logfilename, + "%s"PATHSEP, reldir); + } + else +#ifdef DEFAULTDIR + if (logdir) + { + left = snprintf(logfilename, sizeof logfilename, + "%s"PATHSEP DEFAULTDIR PATHSEP"%s"PATHSEP, logdir, reldir); + } + else +#endif/*DEFAULTDIR*/ + { + left = snprintf(logfilename, sizeof logfilename, + "."PATHSEP"%s"PATHSEP, reldir); + } + + strftime(&logfilename[left], sizeof logfilename - left, + format, timeinfo); + } + + M_MkdirEachUntil(logfilename, + M_PathParts(logdir) - 1, + M_PathParts(logfilename) - 1, 0755); + +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) + logstream = fopen(logfilename, "w"); +#ifdef DEFAULTDIR + if (logdir) + link = va("%s/"DEFAULTDIR"/latest-log.txt", logdir); + else +#endif/*DEFAULTDIR*/ + link = "latest-log.txt"; + unlink(link); + if (symlink(logfilename, link) == -1) + { + I_OutputMsg("Error symlinking latest-log.txt: %s\n", strerror(errno)); + } +#else/*defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)*/ + logstream = fopen("latest-log.txt", "wt+"); +#endif/*defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)*/ +} +#endif + +int main(int argc, char **argv) +{ + myargc = argc; + myargv = argv; /// \todo pull out path to exe from this string + + dedicated = true; + +#ifdef HAVE_LIBBACKTRACE + bt_state = backtrace_create_state( + argv[0], +#ifdef HAVE_THREADS + 1, +#else + 0, +#endif + NULL, + NULL + ); +#endif + +#ifdef _WIN32 + ChDirToExe(); +#endif + +#ifdef LOGMESSAGES + if (!M_CheckParm("-nolog")) + InitLogging(); +#endif/*LOGMESSAGES*/ + + //I_OutputMsg("I_StartupSystem() ...\n"); + I_StartupSystem(); +#if defined (_WIN32) + { +#ifdef DRMINGW + ExcHndlInit(); +#endif + } +#endif + + // startup SRB2 + CONS_Printf("Setting up SRB2Kart...\n"); + D_SRB2Main(); + CONS_Printf("Entering main game loop...\n"); + // never return + D_SRB2Loop(); + +#ifdef BUGTRAP + // This is safe even if BT didn't start. + ShutdownBugTrap(); +#endif + + // return to OS + return 0; +} diff --git a/src/dedicated/i_sound.c b/src/dedicated/i_sound.c new file mode 100644 index 000000000..de43aab85 --- /dev/null +++ b/src/dedicated/i_sound.c @@ -0,0 +1,339 @@ +// Emacs style mode select -*- C++ -*- +//----------------------------------------------------------------------------- +// +// Copyright (C) 1993-1996 by id Software, Inc. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// The source is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//----------------------------------------------------------------------------- +/// \file +/// \brief SDL interface for sound + +#include +#include "../doomdef.h" +#include "../i_sound.h" +#include "../s_sound.h" + +/** \brief Sound subsystem runing and waiting +*/ +UINT8 sound_started = false; + +/** \brief The I_GetSfx function + + \param sfx sfx to setup + + \return data for sfx +*/ +void *I_GetSfx(sfxinfo_t *sfx) +{ + (void)sfx; + return NULL; +} + +/** \brief The I_FreeSfx function + + \param sfx sfx to be freed up + + \return void +*/ +void I_FreeSfx(sfxinfo_t *sfx) +{ + (void)sfx; +} + +/** \brief Init at program start... +*/ +void I_StartupSound(void){} + +/** \brief ... shut down and relase at program termination. +*/ +void I_ShutdownSound(void){} + +/// ------------------------ +/// SFX I/O +/// ------------------------ + +/** \brief Starts a sound in a particular sound channel. + \param id sfxid + \param vol volume for sound + \param sep left-right balancle + \param pitch not used + \param priority not used + + \return sfx handle +*/ +INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel) +{ + (void)id; + (void)vol; + (void)sep; + (void)pitch; + (void)priority; + (void)channel; + return 0; +} + +/** \brief Stops a sound channel. + + \param handle stop sfx handle + + \return void +*/ +void I_StopSound(INT32 handle) +{ + (void)handle; +} + +/** \brief Some digital sound drivers need this. +*/ +void I_UpdateSound(void){} + +/** \brief Called by S_*() functions to see if a channel is still playing. + + \param handle sfx handle + + \return 0 if no longer playing, 1 if playing. +*/ +boolean I_SoundIsPlaying(INT32 handle) +{ + (void)handle; + return false; +} + +/** \brief Updates the sfx handle + + \param handle sfx handle + \param vol volume + \param sep separation + \param pitch ptich + + \return void +*/ +void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch) +{ + (void)handle; + (void)vol; + (void)sep; + (void)pitch; +} + +/** \brief The I_SetSfxVolume function + + \param volume volume to set at + + \return void +*/ +void I_SetSfxVolume(UINT8 volume) +{ + (void)volume; +} + +/// ------------------------ +// MUSIC SYSTEM +/// ------------------------ + +/** \brief Init the music systems +*/ +void I_InitMusic(void){} + +/** \brief Shutdown the music systems +*/ +void I_ShutdownMusic(void){} + +/// ------------------------ +// MUSIC PROPERTIES +/// ------------------------ + +musictype_t I_SongType(void) +{ + return MU_NONE; +} + +boolean I_SongPlaying(void) +{ + return false; +} + +boolean I_SongPaused(void) +{ + return false; +} + +/// ------------------------ +// MUSIC EFFECTS +/// ------------------------ + +boolean I_SetSongSpeed(float speed) +{ + (void)speed; + return false; +} + +/// ------------------------ +// MUSIC SEEKING +/// ------------------------ + +UINT32 I_GetSongLength(void) +{ + return 0; +} + +boolean I_SetSongLoopPoint(UINT32 looppoint) +{ + (void)looppoint; + return false; +} + +UINT32 I_GetSongLoopPoint(void) +{ + return 0; +} + +boolean I_SetSongPosition(UINT32 position) +{ + (void)position; + return false; +} + +UINT32 I_GetSongPosition(void) +{ + return 0; +} + +/// ------------------------ +// MUSIC PLAYBACK +/// ------------------------ + +/** \brief Registers a song handle to song data. + + \param data pointer to song data + \param len len of data + + \return song handle + + \todo Remove this +*/ +boolean I_LoadSong(char *data, size_t len) +{ + (void)data; + (void)len; + return false; +} + +/** \brief See ::I_LoadSong, then think backwards + + \param handle song handle + + \sa I_LoadSong + \todo remove midi handle +*/ +void I_UnloadSong(void){} + +/** \brief Called by anything that wishes to start music + + \param handle Song handle + \param looping looping it if true + + \return if true, it's playing the song + + \todo pass music name, not handle +*/ +boolean I_PlaySong(boolean looping) +{ + (void)looping; + return false; +} + +/** \brief Stops a song over 3 seconds + + \param handle Song handle + \return void + + /todo drop handle +*/ +void I_StopSong(void){} + +/** \brief PAUSE game handling. + + \param handle song handle + + \return void +*/ +void I_PauseSong(void){} + +/** \brief RESUME game handling + + \param handle song handle + + \return void +*/ +void I_ResumeSong(void){} + +/** \brief The I_SetMusicVolume function + + \param volume volume to set at + + \return void +*/ +void I_SetMusicVolume(UINT8 volume) +{ + (void)volume; +} + +boolean I_SetSongTrack(INT32 track) +{ + (void)track; + return false; +} + +/// ------------------------ +/// MUSIC FADING +/// ------------------------ + +void I_SetInternalMusicVolume(UINT8 volume) +{ + (void)volume; +} + +void I_StopFadingSong(void){} + +boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, void (*callback)(void)) +{ + (void)target_volume; + (void)source_volume; + (void)ms; + (void)callback; + return false; +} + +boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void)) +{ + (void)target_volume; + (void)ms; + (void)callback; + return false; +} + +boolean I_FadeOutStopSong(UINT32 ms) +{ + (void)ms; + return false; +} + +boolean I_FadeInPlaySong(UINT32 ms, boolean looping) +{ + (void)ms; + (void)looping; + return false; +} + +void I_UpdateSongLagThreshold(void) +{ +} diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c new file mode 100644 index 000000000..e568873f0 --- /dev/null +++ b/src/dedicated/i_system.c @@ -0,0 +1,2218 @@ +// Emacs style mode select -*- C++ -*- +// +// SONIC ROBO BLAST 2 +//----------------------------------------------------------------------------- +// +// Copyright (C) 1993-1996 by id Software, Inc. +// Portions Copyright (C) 1998-2000 by DooM Legacy Team. +// Copyright (C) 2014-2018 by Sonic Team Junior. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// Changes by Graue are in the public domain. +// +//----------------------------------------------------------------------------- +/// \file +/// \brief SRB2 system stuff for dedicated + +#ifdef CMAKECONFIG +#include "config.h" +#else +#include "../config.h.in" +#endif + +#include + +// A little more than the minimum sleep duration on Windows. +// May be incorrect for other platforms, but we don't currently have a way to +// query the scheduler granularity. SDL will do what's needed to make this as +// low as possible though. +#define MIN_SLEEP_DURATION_MS 2.1 + +#ifdef _WIN32 +#define RPC_NO_WINDOWS_H +#include +#include "../doomtype.h" +typedef BOOL (WINAPI *p_GetDiskFreeSpaceExA)(LPCSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER); +typedef BOOL (WINAPI *p_IsProcessorFeaturePresent) (DWORD); +typedef DWORD (WINAPI *p_timeGetTime) (void); +typedef UINT (WINAPI *p_timeEndPeriod) (UINT); +typedef HANDLE (WINAPI *p_OpenFileMappingA) (DWORD, BOOL, LPCSTR); +typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); +#endif + +#include +#include +#include +#ifdef __GNUC__ +#include +#elif defined (_MSC_VER) +#include +#endif +#if defined (__unix__) || defined (UNIXCOMMON) +#include +#endif + +#include +#ifdef _WIN32 +#include +#endif + +#ifdef _MSC_VER +#pragma warning(disable : 4214 4244) +#endif + +#if defined (__unix__) || defined(__APPLE__) || (defined (UNIXCOMMON) && !defined (__HAIKU__)) +#include +#if defined (__linux__) +#include +#else +#include +#include +/*For meminfo*/ +#include +#ifdef FREEBSD +#include +#endif +#include +#include +#endif +#endif + +#if defined (__linux__) || (defined (UNIXCOMMON) && !defined (__HAIKU__)) +#ifndef NOTERMIOS +#include +#include // ioctl +#define HAVE_TERMIOS +#endif +#endif + +#if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__)) +#include +#include +#include +#define NEWSIGNALHANDLER +#endif + +#ifndef NOMUMBLE +#ifdef __linux__ // need -lrt +#include +#ifdef MAP_FAILED +#define HAVE_SHM +#endif +#include +#endif + +#ifdef _WIN32 +#define HAVE_MUMBLE +#define WINMUMBLE +#elif defined (HAVE_SHM) +#define HAVE_MUMBLE +#endif +#endif // NOMUMBLE + +#ifndef O_BINARY +#define O_BINARY 0 +#endif + +#ifdef __APPLE__ +#include "macosx/mac_resources.h" +#endif + +#ifndef errno +#include +#endif + +// Locations for searching the srb2.srb +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) +#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart" +#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart" +#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart" +#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart" +#define DEFAULTSEARCHPATH1 "/usr/local/games" +#define DEFAULTSEARCHPATH2 "/usr/games" +#define DEFAULTSEARCHPATH3 "/usr/local" +#endif + +/** \brief WAD file to look for +*/ +#define WADKEYWORD1 "srb2.srb" +#define WADKEYWORD2 "srb2.wad" +/** \brief holds wad path +*/ +static char returnWadPath[256]; + +#include "../doomdef.h" +#include "../m_misc.h" +#include "../i_video.h" +#include "../i_sound.h" +#include "../i_system.h" +#include "../screen.h" //vid.WndParent +#include "../d_net.h" +#include "../g_game.h" +#include "../filesrch.h" +#include "../z_zone.h" // Z_Free +#include "endtxt.h" + +#include "../i_joy.h" + +#include "../m_argv.h" + +#ifdef MAC_ALERT +#include "macosx/mac_alert.h" +#endif + +#include "../d_main.h" + +#if !defined(NOMUMBLE) && defined(HAVE_MUMBLE) +// Mumble context string +#include "../d_clisrv.h" +#include "../byteptr.h" +#endif + +#ifdef HAVE_LIBBACKTRACE +#include +// TODO - move this to some header file instead +extern struct backtrace_state *bt_state; + +typedef struct bt_crash_reason_s { + enum { + BTCRASH_SIGNAL, + BTCRASH_ERRORMSG, + } type; + + union { + INT32 signal; + const char *errormsg; + } value; +} bt_crash_reason_t; + +#define BT_CRASH_REASON_SIGNAL(num) (bt_crash_reason_t){ .type = BTCRASH_SIGNAL, .value = { .signal = num } } +#define BT_CRASH_REASON_ERRORMSG(msg) (bt_crash_reason_t){ .type = BTCRASH_ERRORMSG, .value = { .errormsg = msg } } + +static void printsignal(FILE *fp, INT32 num) +{ + switch (num) + { + case SIGILL: + fprintf(fp, "SIGILL - illegal instruction - invalid function image"); + break; + case SIGFPE: + fprintf(fp, "SIGFPE - mathematical exception"); + break; + case SIGSEGV: + fprintf(fp, "SIGSEGV - segment violation"); + break; + case SIGABRT: + fprintf(fp, "SIGABRT - abnormal termination triggered by abort call"); + break; + default: + fprintf(fp, "Signal number %d", num); + } +} + +typedef struct bt_out_buf_s { + boolean error; + char *pos; + size_t size; +} bt_out_buf_t; + +static void bt_syminfo_cb(void *data, uintptr_t pc, const char *symname, uintptr_t symval, uintptr_t symsize) +{ + (void)symval; + (void)symsize; + + bt_out_buf_t *buf = (bt_out_buf_t*)data; + + if (!symname) + symname = "???"; + + int n = snprintf(buf->pos, buf->size, "%p %s\n", (void*)pc, symname); + + if (n <= 0) + { + buf->size = 0; + return; + } + + buf->pos += n; + buf->size -= n; +} + +static int bt_simple_cb(void *data, uintptr_t pc) +{ + bt_out_buf_t *buf = (bt_out_buf_t*)data; + + backtrace_syminfo(bt_state, pc, bt_syminfo_cb, NULL, data); + + if (!buf->size) return 1; + + return 0; +} + +static int bt_full_cb(void *data, uintptr_t pc, const char *filename, int lineno, const char *function) +{ + bt_out_buf_t *buf = (bt_out_buf_t*)data; + + if (!filename) filename = "???"; + if (!function) function = "???"; + + int n = snprintf(buf->pos, buf->size, "%p %s\n\t%s:%d\n", (void*)pc, function, filename, lineno); + + if (n <= 0) return 1; + + buf->pos += n; + buf->size -= n; + + if (!buf->size) return 1; + + return 0; +} + +static void bt_error_cb(void *data, const char *msg, int errnum) +{ + (void)msg; // We don't need this + + bt_out_buf_t *buf = (bt_out_buf_t*)data; + + // No debug info + if (errnum == -1) + buf->error = true; +} + +static void write_backtrace(bt_crash_reason_t reason) +{ + FILE *out = fopen(va("%s" PATHSEP "%s", srb2home, "srb2kart-crash-log.txt"), "a"); + + time_t rawtime; + struct tm *timeinfo; + + const size_t BUFSIZE = 8192; + char backtrace[BUFSIZE]; + + bt_out_buf_t buf; + buf.error = false; + buf.pos = backtrace; + buf.size = BUFSIZE; + + + if (!out) + { + fprintf(stderr, "\nWARNING: Couldn't open crash log for writing! Make sure your permissions are correct. Please save the below report!\n"); + out = stderr; + } + + // Get the current time as a string. + time(&rawtime); + timeinfo = localtime(&rawtime); + + fprintf(out, "------------------------\n\n"); + + fprintf(out, "Program name: %s %s\n", SRB2APPLICATION, VERSIONSTRING); + + if (compdate && comptime && comprevision && compbranch) + fprintf(out, "Compiled: %s %s, commit %s, branch %s\n", compdate, comptime, comprevision, compbranch); + + if (gamestate == GS_LEVEL) + { + char *title = G_BuildMapTitle(gamemap); + + if (title) + { + fprintf(out, "Game map: %s (%s)\n", title, G_BuildMapName(gamemap)); + Z_Free(title); + } + else + fprintf(out, "Game map: %s\n", G_BuildMapName(gamemap)); + } + + fprintf(out, "Time of crash: %s\n", asctime(timeinfo)); + + fprintf(out, "Caused by: "); + + switch (reason.type) + { + case BTCRASH_SIGNAL: + printsignal(out, reason.value.signal); + break; + + case BTCRASH_ERRORMSG: + fprintf(out, "%s", reason.value.errormsg); + break; + } + + fprintf(out, "\nBacktrace:\n"); + + // Try to get full backtrace, it will print files and line numbers + backtrace_full(bt_state, 2, bt_full_cb, bt_error_cb, (void*)&buf); + + if (buf.error) + { + // Fall back to simple backtrace, only prints function names + backtrace_simple(bt_state, 2, bt_simple_cb, NULL, (void*)&buf); + } + + fputs(backtrace, out); + + if (out != stderr) + { + fclose(out); + fprintf(stderr, "Crash report created, find srb2kart-crash-log.txt in your SRB2Kart directory\n"); + } +} + +#endif + +boolean consolevent = false; +boolean framebuffer = false; + +boolean g_in_exiting_signal_handler = false; + +UINT8 keyboard_started = false; + +static void I_ReportSignal(int num, int coredumped) +{ + //static char msg[] = "oh no! back to reality!\r\n"; + const char * sigmsg; + char msg[256]; + + switch (num) + { +// case SIGINT: +// sigmsg = "SIGINT - interrupted"; +// break; + case SIGILL: + sigmsg = "SIGILL - illegal instruction - invalid function image"; + break; + case SIGFPE: + sigmsg = "SIGFPE - mathematical exception"; + break; + case SIGSEGV: + sigmsg = "SIGSEGV - segment violation"; + break; +// case SIGTERM: +// sigmsg = "SIGTERM - Software termination signal from kill"; +// break; +// case SIGBREAK: +// sigmsg = "SIGBREAK - Ctrl-Break sequence"; +// break; + case SIGABRT: + sigmsg = "SIGABRT - abnormal termination triggered by abort call"; + break; + default: + sprintf(msg,"signal number %d", num); + if (coredumped) + sigmsg = 0; + else + sigmsg = msg; + } + + if (coredumped) + { + if (sigmsg) + sprintf(msg, "%s (core dumped)", sigmsg); + else + strcat(msg, " (core dumped)"); + } + else + { + sprintf(msg, "%s", sigmsg); + } + +#ifdef HAVE_LIBBACKTRACE + strncat(msg, "\n\nCrash report has been saved into srb2kart-crash-log.txt", 255); +#elif defined(_WIN32) && !defined(__MINGW64__) + strncat(msg, "\n\nCrash report has been saved into srb2kart.rpt", 255); +#endif + + I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg); +} + +#ifndef NEWSIGNALHANDLER +FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num) +{ + g_in_exiting_signal_handler = true; + + D_QuitNetGame(); // Fix server freezes + +#ifdef HAVE_LIBBACKTRACE + write_backtrace(BT_CRASH_REASON_SIGNAL(num)); +#endif + + if (demo.recording) + G_SaveDemo(); + + I_ReportSignal(num, 0); + I_ShutdownSystem(); + signal(num, SIG_DFL); //default signal action + raise(num); + I_Quit(); +} +#endif + +FUNCNORETURN static ATTRNORETURN void quit_handler(int num) +{ + signal(num, SIG_DFL); //default signal action + raise(num); + I_Quit(); +} + +#ifdef HAVE_TERMIOS +// TERMIOS console code from Quake3: thank you! +boolean stdin_active = true; + +typedef struct +{ + size_t cursor; + char buffer[256]; +} feild_t; + +feild_t tty_con; + +// lock to prevent clearing partial lines, since not everything +// printed ends on a newline. +static boolean ttycon_ateol = true; +// some key codes that the terminal may be using +// TTimo NOTE: I'm not sure how relevant this is +static INT32 tty_erase; +static INT32 tty_eof; + +static struct termios tty_tc; + +// ============================================================= +// tty console routines +// NOTE: if the user is editing a line when something gets printed to the early console then it won't look good +// so we provide tty_Clear and tty_Show to be called before and after a stdout or stderr output +// ============================================================= + +// flush stdin, I suspect some terminals are sending a LOT of garbage +// FIXME TTimo relevant? +#if 0 +static inline void tty_FlushIn(void) +{ + char key; + while (read(STDIN_FILENO, &key, 1)!=-1); +} +#endif + +// do a backspace +// TTimo NOTE: it seems on some terminals just sending '\b' is not enough +// so for now, in any case we send "\b \b" .. yeah well .. +// (there may be a way to find out if '\b' alone would work though) +// Hanicef NOTE: using \b this way is unreliable because of terminal state, +// it's better to use \r to reset the cursor to the beginning of the +// line and clear from there. +static void tty_Back(void) +{ + write(STDOUT_FILENO, "\r", 1); + if (tty_con.cursor>0) + { + write(STDOUT_FILENO, tty_con.buffer, tty_con.cursor); + } + write(STDOUT_FILENO, " \b", 2); +} + +static void tty_Clear(void) +{ + size_t i; + write(STDOUT_FILENO, "\r", 1); + if (tty_con.cursor>0) + { + for (i=0; i 0) + { + tty_con.cursor--; + tty_con.buffer[tty_con.cursor] = '\0'; + tty_Back(); + } + ev.data1 = KEY_BACKSPACE; + } + else if (key < ' ') // check if this is a control char + { + if (key == '\n') + { + tty_Clear(); + tty_con.cursor = 0; + ev.data1 = KEY_ENTER; + } + else if (key == 0x4) // ^D, aka EOF + { + // shut down, most unix programs behave this way + I_Quit(); + } + else continue; + } + else if (tty_con.cursor < sizeof(tty_con.buffer)) + { + // push regular character + ev.data1 = tty_con.buffer[tty_con.cursor] = key; + tty_con.cursor++; + // print the current line (this is differential) + write(STDOUT_FILENO, &key, 1); + } + if (ev.data1) D_PostEvent(&ev); + } +} + +#elif defined (_WIN32) +static BOOL I_ReadyConsole(HANDLE ci) +{ + DWORD gotinput; + if (ci == INVALID_HANDLE_VALUE) return FALSE; + if (WaitForSingleObject(ci,0) != WAIT_OBJECT_0) return FALSE; + if (GetFileType(ci) != FILE_TYPE_CHAR) return FALSE; + if (!GetConsoleMode(ci, &gotinput)) return FALSE; + return (GetNumberOfConsoleInputEvents(ci, &gotinput) && gotinput); +} + +static boolean entering_con_command = false; + +static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co) +{ + event_t event; + CONSOLE_SCREEN_BUFFER_INFO CSBI; + DWORD t; + + memset(&event,0x00,sizeof (event)); + + if (evt.bKeyDown) + { + event.type = ev_console; + entering_con_command = true; + switch (evt.wVirtualKeyCode) + { + case VK_ESCAPE: + case VK_TAB: + event.data1 = KEY_NULL; + break; + case VK_RETURN: + entering_con_command = false; + // Fall through. + default: + //event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char + event.data1 = evt.uChar.AsciiChar; + } + if (co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &t)) + { + if (event.data1 && event.data1 != KEY_LSHIFT && event.data1 != KEY_RSHIFT) + { +#ifdef _UNICODE + WriteConsole(co, &evt.uChar.UnicodeChar, 1, &t, NULL); +#else + WriteConsole(co, &evt.uChar.AsciiChar, 1 , &t, NULL); +#endif + } + if (evt.wVirtualKeyCode == VK_BACK + && GetConsoleScreenBufferInfo(co,&CSBI)) + { + WriteConsoleOutputCharacterA(co, " ",1, CSBI.dwCursorPosition, &t); + } + } + } + if (event.data1) D_PostEvent(&event); +} + +void I_GetConsoleEvents(void) +{ + HANDLE ci = GetStdHandle(STD_INPUT_HANDLE); + HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE); + INPUT_RECORD input; + DWORD t; + + while (I_ReadyConsole(ci) && ReadConsoleInput(ci, &input, 1, &t) && t) + { + switch (input.EventType) + { + case KEY_EVENT: + Impl_HandleKeyboardConsoleEvent(input.Event.KeyEvent, co); + break; + case MOUSE_EVENT: + case WINDOW_BUFFER_SIZE_EVENT: + case MENU_EVENT: + case FOCUS_EVENT: + break; + } + } +} + +static void I_StartupConsole(void) +{ + HANDLE ci, co; + const INT32 ded = M_CheckParm("-dedicated"); + BOOL gotConsole = FALSE; + if (M_CheckParm("-console") || ded) + gotConsole = AllocConsole(); +#ifdef _DEBUG + else if (M_CheckParm("-noconsole") && !ded) +#else + else if (!M_CheckParm("-console") && !ded) +#endif + { + FreeConsole(); + gotConsole = FALSE; + } + + if (gotConsole) + { + SetConsoleTitleA("SRB2Kart Console"); + consolevent = true; + } + + //Let get the real console HANDLE, because Mingw's Bash is bad! + ci = CreateFile(TEXT("CONIN$") , GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + co = CreateFile(TEXT("CONOUT$"), GENERIC_WRITE|GENERIC_READ, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (ci != INVALID_HANDLE_VALUE) + { + const DWORD CM = ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT; + SetStdHandle(STD_INPUT_HANDLE, ci); + if (GetFileType(ci) == FILE_TYPE_CHAR) + SetConsoleMode(ci, CM); //default mode but no ENABLE_MOUSE_INPUT + } + if (co != INVALID_HANDLE_VALUE) + { + SetStdHandle(STD_OUTPUT_HANDLE, co); + SetStdHandle(STD_ERROR_HANDLE, co); + } +} +static inline void I_ShutdownConsole(void){} +#else +void I_GetConsoleEvents(void){} +static inline void I_StartupConsole(void) +{ +#ifdef _DEBUG + consolevent = !M_CheckParm("-noconsole"); +#else + consolevent = M_CheckParm("-console"); +#endif + + framebuffer = M_CheckParm("-framebuffer"); + + if (framebuffer) + consolevent = false; +} +static inline void I_ShutdownConsole(void){} +#endif + +// +// StartupKeyboard +// +static void I_RegisterSignals (void) +{ +#ifdef SIGINT + signal(SIGINT , quit_handler); +#endif +#ifdef SIGBREAK + signal(SIGBREAK , quit_handler); +#endif +#ifdef SIGTERM + signal(SIGTERM , quit_handler); +#endif + + // If these defines don't exist, + // then compilation would have failed above us... +#ifndef NEWSIGNALHANDLER + signal(SIGILL , signal_handler); + signal(SIGSEGV , signal_handler); + signal(SIGABRT , signal_handler); + signal(SIGFPE , signal_handler); +#endif +} + +#ifdef NEWSIGNALHANDLER +static void signal_handler_child(INT32 num) +{ +#ifdef HAVE_LIBBACKTRACE + write_backtrace(BT_CRASH_REASON_SIGNAL(num)); +#endif + + if (demo.recording) + G_SaveDemo(); + + signal(num, SIG_DFL); //default signal action + raise(num); +} + +static void I_RegisterChildSignals(void) +{ + // If these defines don't exist, + // then compilation would have failed above us... + signal(SIGILL , signal_handler_child); + signal(SIGSEGV , signal_handler_child); + signal(SIGABRT , signal_handler_child); + signal(SIGFPE , signal_handler_child); +} +#endif + +// +//I_OutputMsg +// +void I_OutputMsg(const char *fmt, ...) +{ + size_t len; + char *txt; + va_list argptr; + + va_start(argptr,fmt); + len = vsnprintf(NULL, 0, fmt, argptr); + va_end(argptr); + if (len == 0) + return; + + txt = malloc(len+1); + va_start(argptr,fmt); + vsprintf(txt, fmt, argptr); + va_end(argptr); + +#ifdef HAVE_TTF + if (TTF_WasInit()) I_TTFDrawText(currentfont, solid, DEFAULTFONTFGR, DEFAULTFONTFGG, DEFAULTFONTFGB, DEFAULTFONTFGA, + DEFAULTFONTBGR, DEFAULTFONTBGG, DEFAULTFONTBGB, DEFAULTFONTBGA, txt); +#endif + +#if defined (_WIN32) && defined (_MSC_VER) + OutputDebugStringA(txt); +#endif + + len = strlen(txt); + +#ifdef LOGMESSAGES + if (logstream) + { + size_t d = fwrite(txt, len, 1, logstream); + fflush(logstream); + (void)d; + } +#endif + +#if defined (_WIN32) +#ifdef DEBUGFILE + if (debugfile != stderr) +#endif + { + HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE); + DWORD bytesWritten; + + if (co == INVALID_HANDLE_VALUE) + { + free(txt); + return; + } + + if (GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &bytesWritten)) + { + static COORD coordNextWrite = {0,0}; + LPVOID oldLines = NULL; + INT oldLength; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + // Save the lines that we're going to obliterate. + GetConsoleScreenBufferInfo(co, &csbi); + oldLength = csbi.dwSize.X * (csbi.dwCursorPosition.Y - coordNextWrite.Y) + csbi.dwCursorPosition.X - coordNextWrite.X; + + if (oldLength > 0) + { + LPVOID blank = malloc(oldLength); + if (!blank) + { + free(txt); + return; + } + memset(blank, ' ', oldLength); // Blank out. + oldLines = malloc(oldLength*sizeof(TCHAR)); + if (!oldLines) + { + free(txt); + free(blank); + return; + } + + ReadConsoleOutputCharacter(co, oldLines, oldLength, coordNextWrite, &bytesWritten); + + // Move to where we what to print - which is where we would've been, + // had console input not been in the way, + SetConsoleCursorPosition(co, coordNextWrite); + + WriteConsoleA(co, blank, oldLength, &bytesWritten, NULL); + free(blank); + + // And back to where we want to print again. + SetConsoleCursorPosition(co, coordNextWrite); + } + + // Actually write the string now! + WriteConsoleA(co, txt, (DWORD)len, &bytesWritten, NULL); + + // Next time, output where we left off. + GetConsoleScreenBufferInfo(co, &csbi); + coordNextWrite = csbi.dwCursorPosition; + + // Restore what was overwritten. + if (oldLines && entering_con_command) + WriteConsole(co, oldLines, oldLength, &bytesWritten, NULL); + if (oldLines) free(oldLines); + } + else // Redirected to a file. + WriteFile(co, txt, (DWORD)len, &bytesWritten, NULL); + } +#else +#ifdef HAVE_TERMIOS + if (consolevent && ttycon_ateol) + { + tty_Clear(); + ttycon_ateol = false; + } +#endif + + if (!framebuffer) + fprintf(stderr, "%s", txt); +#ifdef HAVE_TERMIOS + if (consolevent && txt[len-1] == '\n') + { + write(STDOUT_FILENO, tty_con.buffer, tty_con.cursor); + ttycon_ateol = true; + } +#endif + + // 2004-03-03 AJR Since not all messages end in newline, some were getting displayed late. + if (!framebuffer) + fflush(stderr); + +#endif + free(txt); +} + +// +// I_GetKey +// +INT32 I_GetKey (void) +{ + // Warning: I_GetKey empties the event queue till next keypress + event_t *ev; + INT32 rc = 0; + + // return the first keypress from the event queue + for (; eventtail != eventhead; eventtail = (eventtail+1)&(MAXEVENTS-1)) + { + ev = &events[eventtail]; + if (ev->type == ev_keydown || ev->type == ev_console) + { + rc = ev->data1; + continue; + } + } + + return rc; +} + +// +// I_JoyScale +// +void I_JoyScale(void) +{ +} + +void I_JoyScale2(void) +{ +} + +void I_JoyScale3(void) +{ +} + +void I_JoyScale4(void) +{ +} + +/** \brief Shuts down joystick 1 + + + \return void + + +*/ +void I_ShutdownJoystick(void) +{ +} + +void I_GetJoystickEvents(UINT8 index) +{ + (void)index; +} + +// +// I_InitJoystick +// +void I_InitJoystick(UINT8 index) +{ + (void)index; +} + +void I_InitJoystick1(void) +{ +} + +void I_InitJoystick2(void) +{ +} + +void I_InitJoystick3(void) +{ +} + +void I_InitJoystick4(void) +{ +} + +INT32 I_NumJoys(void) +{ + return 0; +} + +const char *I_GetJoyName(INT32 joyindex) +{ + (void)joyindex; + return NULL; +} + +void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration) +{ + (void)playernum; + (void)low_strength; + (void)high_strength; + (void)duration; +} + +void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 blue) +{ + (void)playernum; + (void)red; + (void)green; + (void)blue; +} + +#ifndef NOMUMBLE +#ifdef HAVE_MUMBLE +// Best Mumble positional audio settings: +// Minimum distance 3.0 m +// Bloom 175% +// Maximum distance 80.0 m +// Minimum volume 50% +#define DEG2RAD (0.017453292519943295769236907684883l) // TAU/360 or PI/180 +#define MUMBLEUNIT (64.0f) // FRACUNITS in a Meter + +static struct { +#ifdef WINMUMBLE + UINT32 uiVersion; + DWORD uiTick; +#else + UINT32 uiVersion; + UINT32 uiTick; +#endif + float fAvatarPosition[3]; + float fAvatarFront[3]; + float fAvatarTop[3]; // defaults to Y-is-up (only used for leaning) + wchar_t name[256]; // game name + float fCameraPosition[3]; + float fCameraFront[3]; + float fCameraTop[3]; // defaults to Y-is-up (only used for leaning) + wchar_t identity[256]; // player id +#ifdef WINMUMBLE + UINT32 context_len; +#else + UINT32 context_len; +#endif + unsigned char context[256]; // server/team + wchar_t description[2048]; // game description +} *mumble = NULL; +#endif // HAVE_MUMBLE + +static void I_SetupMumble(void) +{ +#ifdef WINMUMBLE + HANDLE hMap = OpenFileMappingW(FILE_MAP_ALL_ACCESS, FALSE, L"MumbleLink"); + if (!hMap) + return; + + mumble = MapViewOfFile(hMap, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(*mumble)); + if (!mumble) + CloseHandle(hMap); +#elif defined (HAVE_SHM) + int shmfd; + char memname[256]; + + snprintf(memname, 256, "/MumbleLink.%d", getuid()); + shmfd = shm_open(memname, O_RDWR, S_IRUSR | S_IWUSR); + + if(shmfd < 0) + return; + + mumble = mmap(NULL, sizeof(*mumble), PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, 0); + if (mumble == MAP_FAILED) + mumble = NULL; +#endif +} + +void I_UpdateMumble(const mobj_t *mobj, const listener_t listener) +{ +#ifdef HAVE_MUMBLE + double angle; + fixed_t anglef; + + if (!mumble) + return; + + if (mumble->uiVersion != 2) { + wcsncpy(mumble->name, L"SRB2Kart "VERSIONSTRINGW, 256); + wcsncpy(mumble->description, L"Sonic Robo Blast 2 Kart with integrated Mumble Link support.", 2048); + mumble->uiVersion = 2; + } + mumble->uiTick++; + + if (!netgame || gamestate != GS_LEVEL) { // Zero out, but never delink. + mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f; + mumble->fAvatarFront[0] = 1.0f; + mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f; + mumble->fCameraPosition[0] = mumble->fCameraPosition[1] = mumble->fCameraPosition[2] = 0.0f; + mumble->fCameraFront[0] = 1.0f; + mumble->fCameraFront[1] = mumble->fCameraFront[2] = 0.0f; + return; + } + + { + UINT8 *p = mumble->context; + WRITEMEM(p, server_context, 8); + WRITEINT16(p, gamemap); + mumble->context_len = (UINT32)(p - mumble->context); + } + + if (mobj) { + mumble->fAvatarPosition[0] = FIXED_TO_FLOAT(mobj->x) / MUMBLEUNIT; + mumble->fAvatarPosition[1] = FIXED_TO_FLOAT(mobj->z) / MUMBLEUNIT; + mumble->fAvatarPosition[2] = FIXED_TO_FLOAT(mobj->y) / MUMBLEUNIT; + + anglef = AngleFixed(mobj->angle); + angle = FIXED_TO_FLOAT(anglef)*DEG2RAD; + mumble->fAvatarFront[0] = (float)cos(angle); + mumble->fAvatarFront[1] = 0.0f; + mumble->fAvatarFront[2] = (float)sin(angle); + } else { + mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f; + mumble->fAvatarFront[0] = 1.0f; + mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f; + } + + mumble->fCameraPosition[0] = FIXED_TO_FLOAT(listener.x) / MUMBLEUNIT; + mumble->fCameraPosition[1] = FIXED_TO_FLOAT(listener.z) / MUMBLEUNIT; + mumble->fCameraPosition[2] = FIXED_TO_FLOAT(listener.y) / MUMBLEUNIT; + + anglef = AngleFixed(listener.angle); + angle = FIXED_TO_FLOAT(anglef)*DEG2RAD; + mumble->fCameraFront[0] = (float)cos(angle); + mumble->fCameraFront[1] = 0.0f; + mumble->fCameraFront[2] = (float)sin(angle); +#else + (void)mobj; + (void)listener; +#endif // HAVE_MUMBLE +} +#undef WINMUMBLE +#endif // NOMUMBLE + + +/** \brief empty ticcmd for player 1 +*/ +static ticcmd_t emptycmd; + +ticcmd_t *I_BaseTiccmd(void) +{ + return &emptycmd; +} + +/** \brief empty ticcmd for player 2 +*/ +static ticcmd_t emptycmd2; + +ticcmd_t *I_BaseTiccmd2(void) +{ + return &emptycmd2; +} + +/** \brief empty ticcmd for player 3 + */ +static ticcmd_t emptycmd3; + +ticcmd_t *I_BaseTiccmd3(void) +{ + return &emptycmd3; +} + +/** \brief empty ticcmd for player 4 + */ +static ticcmd_t emptycmd4; + +ticcmd_t *I_BaseTiccmd4(void) +{ + return &emptycmd4; +} + +// +// I_GetTime +// returns time in 1/TICRATE second tics +// + +precise_t I_GetPreciseTime(void) +{ +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return (precise_t)ts.tv_sec * 1000000000 + ts.tv_nsec; +#elif defined (_WIN32) + LARGE_INTEGER counter; + QueryPerformanceCounter(&counter); + return (precise_t)counter.QuadPart; +#else + return 0; +#endif +} + +UINT64 I_GetPrecisePrecision(void) +{ +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) + return 1000000000; +#elif defined (_WIN32) + LARGE_INTEGER frequency; + QueryPerformanceFrequency(&frequency); + return (UINT64)frequency.QuadPart; +#else + return 1000000; +#endif +} + +void I_StartupTimer(void){} + +void I_Sleep(UINT32 ms) +{ +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) + struct timespec ts = { + .tv_sec = ms / 1000, + .tv_nsec = ms % 1000 * 1000000, + }; + int status; + do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts); + while (status == EINTR); +#elif defined (_WIN32) + Sleep(ms); +#else + (void)ms; +#warning No sleep function for this system! +#endif +} + +void I_SleepDuration(precise_t duration) +{ +#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__) + UINT64 precision = I_GetPrecisePrecision(); + struct timespec ts = { + .tv_sec = duration / precision, + .tv_nsec = duration * 1000000000 / precision % 1000000000, + }; + int status; + do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts); + while (status == EINTR); +#elif defined (MIN_SLEEP_DURATION_MS) + UINT64 precision = I_GetPrecisePrecision(); + INT32 sleepvalue = cv_sleep.value; + UINT64 delaygranularity; + precise_t cur; + precise_t dest; + + { + double gran = round(((double)(precision / 1000) * sleepvalue * MIN_SLEEP_DURATION_MS)); + delaygranularity = (UINT64)gran; + } + + cur = I_GetPreciseTime(); + dest = cur + duration; + + // the reason this is not dest > cur is because the precise counter may wrap + // two's complement arithmetic is our friend here, though! + // e.g. cur 0xFFFFFFFFFFFFFFFE = -2, dest 0x0000000000000001 = 1 + // 0x0000000000000001 - 0xFFFFFFFFFFFFFFFE = 3 + while ((INT64)(dest - cur) > 0) + { + // If our cv_sleep value exceeds the remaining sleep duration, use the + // hard sleep function. + if (sleepvalue > 0 && (dest - cur) > delaygranularity) + { + I_Sleep(sleepvalue); + } + + // Otherwise, this is a spinloop. + + cur = I_GetPreciseTime(); + } +#endif +} + +#ifdef NEWSIGNALHANDLER +FUNCNORETURN static ATTRNORETURN void newsignalhandler_Warn(const char *pr) +{ + char text[128]; + + snprintf(text, sizeof text, + "Error while setting up signal reporting: %s: %s", + pr, + strerror(errno) + ); + + I_OutputMsg("%s\n", text); + + I_ShutdownConsole(); + exit(-1); +} + +static void I_Fork(void) +{ + int child; + int status; + int signum; + int c; + + child = fork(); + + switch (child) + { + case -1: + newsignalhandler_Warn("fork()"); + break; + case 0: + I_RegisterChildSignals(); + break; + default: + if (logstream) + fclose(logstream);/* the child has this */ + + c = wait(&status); + +#ifdef LOGMESSAGES + /* By the way, exit closes files. */ + logstream = fopen(logfilename, "at"); +#else + logstream = 0; +#endif + + if (c == -1) + { + kill(child, SIGKILL); + newsignalhandler_Warn("wait()"); + } + else + { + if (WIFSIGNALED (status)) + { + signum = WTERMSIG (status); +#ifdef WCOREDUMP + I_ReportSignal(signum, WCOREDUMP (status)); +#else + I_ReportSignal(signum, 0); +#endif + status = 128 + signum; + } + else if (WIFEXITED (status)) + { + status = WEXITSTATUS (status); + } + + I_ShutdownConsole(); + exit(status); + } + } +} +#endif/*NEWSIGNALHANDLER*/ + +INT32 I_StartupSystem(void) +{ + I_StartupConsole(); +#ifdef NEWSIGNALHANDLER + I_Fork(); +#endif +#ifdef HAVE_THREADS + I_start_threads(); + I_AddExitFunc(I_stop_threads); +#endif + I_RegisterSignals(); +#ifndef NOMUMBLE + I_SetupMumble(); +#endif + return 0; +} + +// +// I_Quit +// +void I_Quit(void) +{ + static boolean quiting = false; + + /* prevent recursive I_Quit() */ + if (quiting) goto death; + quiting = false; + I_ShutdownConsole(); + M_SaveConfig(NULL); //save game config, cvars.. +#ifndef NONET + D_SaveBan(); // save the ban list +#endif + G_SaveGameData(false); // Tails 12-08-2002 + //added:16-02-98: when recording a demo, should exit using 'q' key, + // but sometimes we forget and use 'F10'.. so save here too. + + if (demo.recording) + G_CheckDemoStatus(); + if (metalrecording) + G_StopMetalRecording(); + + D_QuitNetGame(); + I_ShutdownMusic(); + I_ShutdownSound(); + // use this for 1.28 19990220 by Kin + I_ShutdownGraphics(); + I_ShutdownSystem(); + /* if option -noendtxt is set, don't print the text */ + if (!M_CheckParm("-noendtxt") && W_CheckNumForName("ENDOOM") != LUMPERROR) + { + printf("\r"); + ShowEndTxt(); + } + if (myargmalloc) + free(myargv); // Deallocate allocated memory +death: + W_Shutdown(); + exit(0); +} + +void I_WaitVBL(INT32 count) +{ + count = 1; + I_Sleep(count); +} + +void I_BeginRead(void) +{ +} + +void I_EndRead(void) +{ +} + +// +// I_Error +// +/** \brief phuck recursive errors +*/ +static INT32 errorcount = 0; + +/** \brief recursive error detecting +*/ +static boolean shutdowning = false; + +void I_Error(const char *error, ...) +{ + va_list argptr; + char buffer[8192]; + + // recursive error detecting + if (shutdowning) + { + errorcount++; + // try to shutdown each subsystem separately + if (errorcount == 1) + I_ShutdownMusic(); + if (errorcount == 2) + I_ShutdownSound(); + if (errorcount == 3) + I_ShutdownGraphics(); + if (errorcount == 4) + I_ShutdownSystem(); + if (errorcount == 5) + { + M_SaveConfig(NULL); + G_SaveGameData(false); + } + if (errorcount > 20) + { + va_start(argptr, error); + vsprintf(buffer, error, argptr); + va_end(argptr); + + I_OutputMsg("SRB2Kart %s Recursive Error", buffer); + + W_Shutdown(); + exit(-1); // recursive errors detected + } + } + + shutdowning = true; + + // Display error message in the console before we start shutting it down + va_start(argptr, error); + vsprintf(buffer, error, argptr); + va_end(argptr); + I_OutputMsg("\nI_Error(): %s\n", buffer); + +#ifdef HAVE_LIBBACKTRACE + write_backtrace(BT_CRASH_REASON_ERRORMSG(buffer)); +#endif + // --- + + I_ShutdownConsole(); + + M_SaveConfig(NULL); // save game config, cvars.. +#ifndef NONET + D_SaveBan(); // save the ban list +#endif + G_SaveGameData(false); // Tails 12-08-2002 + + // Shutdown. Here might be other errors. + if (demo.recording) + G_CheckDemoStatus(); + if (metalrecording) + G_StopMetalRecording(); + + D_QuitNetGame(); + I_ShutdownMusic(); + I_ShutdownSound(); + // use this for 1.28 19990220 by Kin + I_ShutdownGraphics(); + I_ShutdownSystem(); + + W_Shutdown(); + +#if defined (PARANOIA) && defined (__CYGWIN__) + *(INT32 *)2 = 4; //Alam: Debug! +#endif + + exit(-1); +} + +/** \brief quit function table +*/ +static quitfuncptr quit_funcs[MAX_QUIT_FUNCS]; /* initialized to all bits 0 */ + +// +// Adds a function to the list that need to be called by I_SystemShutdown(). +// +void I_AddExitFunc(void (*func)()) +{ + INT32 c; + + for (c = 0; c < MAX_QUIT_FUNCS; c++) + { + if (!quit_funcs[c]) + { + quit_funcs[c] = func; + break; + } + } +} + + +// +// Removes a function from the list that need to be called by +// I_SystemShutdown(). +// +void I_RemoveExitFunc(void (*func)()) +{ + INT32 c; + + for (c = 0; c < MAX_QUIT_FUNCS; c++) + { + if (quit_funcs[c] == func) + { + while (c < MAX_QUIT_FUNCS-1) + { + quit_funcs[c] = quit_funcs[c+1]; + c++; + } + quit_funcs[MAX_QUIT_FUNCS-1] = NULL; + break; + } + } +} + +#if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)) +static void Shittycopyerror(const char *name) +{ + I_OutputMsg( + "Error copying log file: %s: %s\n", + name, + strerror(errno) + ); +} + +static void Shittylogcopy(void) +{ + char buf[8192]; + FILE *fp; + size_t r; + if (fseek(logstream, 0, SEEK_SET) == -1) + { + Shittycopyerror("fseek"); + } + else if (( fp = fopen(logfilename, "wt") )) + { + while (( r = fread(buf, 1, sizeof buf, logstream) )) + { + if (fwrite(buf, 1, r, fp) < r) + { + Shittycopyerror("fwrite"); + break; + } + } + if (ferror(logstream)) + { + Shittycopyerror("fread"); + } + fclose(fp); + } + else + { + Shittycopyerror(logfilename); + } +} +#endif/*!(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))*/ + +// +// Closes down everything. This includes restoring the initial +// palette and video mode, and removing whatever mouse, keyboard, and +// timer routines have been installed. +// +// NOTE: Shutdown user funcs are effectively called in reverse order. +// +void I_ShutdownSystem(void) +{ + INT32 c; + +#ifndef NEWSIGNALHANDLER + I_ShutdownConsole(); +#endif + + for (c = MAX_QUIT_FUNCS-1; c >= 0; c--) + if (quit_funcs[c]) + (*quit_funcs[c])(); +#ifdef LOGMESSAGES + if (logstream) + { + I_OutputMsg("I_ShutdownSystem(): end of logstream.\n"); +#if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)) + Shittylogcopy(); +#endif + fclose(logstream); + logstream = NULL; + } +#endif +} + +void I_GetDiskFreeSpace(INT64 *freespace) +{ +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) +#if defined (SOLARIS) || defined (__HAIKU__) + *freespace = INT32_MAX; + return; +#else // Both Linux and BSD have this, apparently. + struct statfs stfs; + if (statfs(".", &stfs) == -1) + { + *freespace = INT32_MAX; + return; + } + *freespace = stfs.f_bavail * stfs.f_bsize; +#endif +#elif defined (_WIN32) + static p_GetDiskFreeSpaceExA pfnGetDiskFreeSpaceEx = NULL; + static boolean testwin95 = false; + ULARGE_INTEGER usedbytes, lfreespace; + + if (!testwin95) + { + pfnGetDiskFreeSpaceEx = (p_GetDiskFreeSpaceExA)(LPVOID)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetDiskFreeSpaceExA"); + testwin95 = true; + } + if (pfnGetDiskFreeSpaceEx) + { + if (pfnGetDiskFreeSpaceEx(NULL, &lfreespace, &usedbytes, NULL)) + *freespace = lfreespace.QuadPart; + else + *freespace = INT32_MAX; + } + else + { + DWORD SectorsPerCluster, BytesPerSector, NumberOfFreeClusters, TotalNumberOfClusters; + GetDiskFreeSpace(NULL, &SectorsPerCluster, &BytesPerSector, + &NumberOfFreeClusters, &TotalNumberOfClusters); + *freespace = BytesPerSector*SectorsPerCluster*NumberOfFreeClusters; + } +#else // Dummy for platform independent; 1GB should be enough + *freespace = 1024*1024*1024; +#endif +} + +char *I_GetUserName(void) +{ + static char username[MAXPLAYERNAME+1]; + char *p; +#ifdef _WIN32 + DWORD i = MAXPLAYERNAME; + + if (!GetUserNameA(username, &i)) +#endif + { + p = I_GetEnv("USER"); + if (!p) + { + p = I_GetEnv("user"); + if (!p) + { + p = I_GetEnv("USERNAME"); + if (!p) + { + p = I_GetEnv("username"); + if (!p) + { + return NULL; + } + } + } + } + strncpy(username, p, MAXPLAYERNAME); + } + + + if (strcmp(username, "") != 0) + return username; + return NULL; // dummy for platform independent version +} + +INT32 I_mkdir(const char *dirname, INT32 unixright) +{ +//[segabor] +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) || defined (__CYGWIN__) || defined (__OS2__) + return mkdir(dirname, unixright); +#elif defined (_WIN32) + UNREFERENCED_PARAMETER(unixright); /// \todo should implement ntright under nt... + return CreateDirectoryA(dirname, NULL); +#else + (void)dirname; + (void)unixright; + return false; +#endif +} + +char *I_GetEnv(const char *name) +{ + return getenv(name); +} + +INT32 I_PutEnv(char *variable) +{ + return putenv(variable); +} + +INT32 I_ClipboardCopy(const char *data, size_t size) +{ + (void)data; + (void)size; + return -1; +} + +const char *I_ClipboardPaste(void) +{ + return NULL; +} + +/** \brief The isWadPathOk function + + \param path string path to check + + \return if true, wad file found + + +*/ +static boolean isWadPathOk(const char *path) +{ + char *wad3path = malloc(256); + + if (!wad3path) + return false; + + sprintf(wad3path, pandf, path, WADKEYWORD1); + + if (FIL_ReadFileOK(wad3path)) + { + free(wad3path); + return true; + } + + sprintf(wad3path, pandf, path, WADKEYWORD2); + + if (FIL_ReadFileOK(wad3path)) + { + free(wad3path); + return true; + } + + free(wad3path); + return false; +} + +static void pathonly(char *s) +{ + size_t j; + + for (j = strlen(s); j != (size_t)-1; j--) + if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/')) + { + if (s[j] == ':') s[j+1] = 0; + else s[j] = 0; + return; + } +} + +/** \brief search for srb2.srb in the given path + + \param searchDir starting path + + \return WAD path if not NULL + + +*/ +static const char *searchWad(const char *searchDir) +{ + static char tempsw[256] = ""; + filestatus_t fstemp; + + strcpy(tempsw, WADKEYWORD1); + fstemp = filesearch(tempsw,searchDir,NULL,true,20); + if (fstemp == FS_FOUND) + { + pathonly(tempsw); + return tempsw; + } + + strcpy(tempsw, WADKEYWORD2); + fstemp = filesearch(tempsw, searchDir, NULL, true, 20); + if (fstemp == FS_FOUND) + { + pathonly(tempsw); + return tempsw; + } + return NULL; +} + +/** \brief go through all possible paths and look for srb2.srb + + \return path to srb2.srb if any +*/ +static const char *locateWad(void) +{ + const char *envstr; + const char *WadPath; + + I_OutputMsg("SRB2WADDIR"); + // does SRB2WADDIR exist? + if (((envstr = I_GetEnv("SRB2WADDIR")) != NULL) && isWadPathOk(envstr)) + return envstr; + +#ifndef NOCWD + I_OutputMsg(",."); + // examine current dir + strcpy(returnWadPath, "."); + if (isWadPathOk(returnWadPath)) + return NULL; +#endif + + +#ifdef DEFAULTDIR + I_OutputMsg(",HOME/" DEFAULTDIR); + // examine user jart directory + if ((envstr = I_GetEnv("HOME")) != NULL) + { + sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr); + if (isWadPathOk(returnWadPath)) + return returnWadPath; + } +#endif + + +#ifdef CMAKECONFIG +#ifndef NDEBUG + I_OutputMsg(","CMAKE_ASSETS_DIR); + strcpy(returnWadPath, CMAKE_ASSETS_DIR); + if (isWadPathOk(returnWadPath)) + { + return returnWadPath; + } +#endif +#endif + +#ifdef __APPLE__ + OSX_GetResourcesPath(returnWadPath); + I_OutputMsg(",%s", returnWadPath); + if (isWadPathOk(returnWadPath)) + { + return returnWadPath; + } +#endif + + // examine default dirs +#ifdef DEFAULTWADLOCATION1 + I_OutputMsg(","DEFAULTWADLOCATION1); + strcpy(returnWadPath, DEFAULTWADLOCATION1); + if (isWadPathOk(returnWadPath)) + return returnWadPath; +#endif +#ifdef DEFAULTWADLOCATION2 + I_OutputMsg(","DEFAULTWADLOCATION2); + strcpy(returnWadPath, DEFAULTWADLOCATION2); + if (isWadPathOk(returnWadPath)) + return returnWadPath; +#endif +#ifdef DEFAULTWADLOCATION3 + I_OutputMsg(","DEFAULTWADLOCATION3); + strcpy(returnWadPath, DEFAULTWADLOCATION3); + if (isWadPathOk(returnWadPath)) + return returnWadPath; +#endif +#ifdef DEFAULTWADLOCATION4 + I_OutputMsg(","DEFAULTWADLOCATION4); + strcpy(returnWadPath, DEFAULTWADLOCATION4); + if (isWadPathOk(returnWadPath)) + return returnWadPath; +#endif +#ifdef DEFAULTWADLOCATION5 + I_OutputMsg(","DEFAULTWADLOCATION5); + strcpy(returnWadPath, DEFAULTWADLOCATION5); + if (isWadPathOk(returnWadPath)) + return returnWadPath; +#endif +#ifdef DEFAULTWADLOCATION6 + I_OutputMsg(","DEFAULTWADLOCATION6); + strcpy(returnWadPath, DEFAULTWADLOCATION6); + if (isWadPathOk(returnWadPath)) + return returnWadPath; +#endif +#ifdef DEFAULTWADLOCATION7 + I_OutputMsg(","DEFAULTWADLOCATION7); + strcpy(returnWadPath, DEFAULTWADLOCATION7); + if (isWadPathOk(returnWadPath)) + return returnWadPath; +#endif +#ifndef NOHOME + // find in $HOME + I_OutputMsg(",HOME/" DEFAULTDIR); + if ((envstr = I_GetEnv("HOME")) != NULL) + { + char *tmp = malloc(strlen(envstr) + sizeof(PATHSEP) + sizeof(DEFAULTDIR)); + strcpy(tmp, envstr); + strcat(tmp, PATHSEP); + strcat(tmp, DEFAULTDIR); + WadPath = searchWad(tmp); + free(tmp); + if (WadPath) + return WadPath; + } +#endif +#ifdef DEFAULTSEARCHPATH1 + // find in /usr/local + I_OutputMsg(", in:"DEFAULTSEARCHPATH1); + WadPath = searchWad(DEFAULTSEARCHPATH1); + if (WadPath) + return WadPath; +#endif +#ifdef DEFAULTSEARCHPATH2 + // find in /usr/games + I_OutputMsg(", in:"DEFAULTSEARCHPATH2); + WadPath = searchWad(DEFAULTSEARCHPATH2); + if (WadPath) + return WadPath; +#endif +#ifdef DEFAULTSEARCHPATH3 + // find in ??? + I_OutputMsg(", in:"DEFAULTSEARCHPATH3); + WadPath = searchWad(DEFAULTSEARCHPATH3); + if (WadPath) + return WadPath; +#endif + // if nothing was found + return NULL; +} + +const char *I_LocateWad(void) +{ + const char *waddir; + + I_OutputMsg("Looking for WADs in: "); + waddir = locateWad(); + I_OutputMsg("\n"); + + if (waddir) + { + // change to the directory where we found srb2.srb +#if defined (_WIN32) + SetCurrentDirectoryA(waddir); +#else + if (chdir(waddir) == -1) + I_OutputMsg("Couldn't change working directory\n"); +#endif + } + return waddir; +} + +#ifdef __linux__ +#define MEMINFO_FILE "/proc/meminfo" +#define MEMTOTAL "MemTotal:" +#define MEMAVAILABLE "MemAvailable:" +#define MEMFREE "MemFree:" +#define CACHED "Cached:" +#define BUFFERS "Buffers:" +#define SHMEM "Shmem:" + +/* Parse the contents of /proc/meminfo (in buf), return value of "name" + * (example: MemTotal) */ +static long get_entry(const char* name, const char* buf) +{ + long val; + char* hit = strstr(buf, name); + if (hit == NULL) { + return -1; + } + + errno = 0; + val = strtol(hit + strlen(name), NULL, 10); + if (errno != 0) { + CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno)); + return -1; + } + return val; +} +#endif + +size_t I_GetFreeMem(size_t *total) +{ +#ifdef FREEBSD + u_int v_free_count, v_page_size, v_page_count; + size_t size = sizeof(v_free_count); + sysctlbyname("vm.stats.vm.v_free_count", &v_free_count, &size, NULL, 0); + size = sizeof(v_page_size); + sysctlbyname("vm.stats.vm.v_page_size", &v_page_size, &size, NULL, 0); + size = sizeof(v_page_count); + sysctlbyname("vm.stats.vm.v_page_count", &v_page_count, &size, NULL, 0); + + if (total) + *total = v_page_count * v_page_size; + return v_free_count * v_page_size; +#elif defined (SOLARIS) + /* Just guess */ + if (total) + *total = 32 << 20; + return 32 << 20; +#elif defined (_WIN32) + MEMORYSTATUS info; + + info.dwLength = sizeof (MEMORYSTATUS); + GlobalMemoryStatus( &info ); + if (total) + *total = (size_t)info.dwTotalPhys; + return (size_t)info.dwAvailPhys; +#elif defined (__OS2__) + UINT32 pr_arena; + + if (total) + DosQuerySysInfo( QSV_TOTPHYSMEM, QSV_TOTPHYSMEM, + (PVOID) total, sizeof (UINT32)); + DosQuerySysInfo( QSV_MAXPRMEM, QSV_MAXPRMEM, + (PVOID) &pr_arena, sizeof (UINT32)); + + return pr_arena; +#elif defined (__linux__) + /* Linux */ + char buf[1024]; + char *memTag; + size_t freeKBytes; + size_t totalKBytes; + INT32 n; + INT32 meminfo_fd = -1; + long Cached; + long MemFree; + long Buffers; + long Shmem; + long MemAvailable = -1; + + meminfo_fd = open(MEMINFO_FILE, O_RDONLY); + n = read(meminfo_fd, buf, 1023); + close(meminfo_fd); + + if (n < 0) + { + // Error + if (total) + *total = 0L; + return 0; + } + + buf[n] = '\0'; + if ((memTag = strstr(buf, MEMTOTAL)) == NULL) + { + // Error + if (total) + *total = 0L; + return 0; + } + + memTag += sizeof (MEMTOTAL); + totalKBytes = (size_t)atoi(memTag); + + if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL) + { + Cached = get_entry(CACHED, buf); + MemFree = get_entry(MEMFREE, buf); + Buffers = get_entry(BUFFERS, buf); + Shmem = get_entry(SHMEM, buf); + MemAvailable = Cached + MemFree + Buffers - Shmem; + + if (MemAvailable == -1) + { + // Error + if (total) + *total = 0L; + return 0; + } + freeKBytes = MemAvailable; + } + else + { + memTag += sizeof (MEMAVAILABLE); + freeKBytes = atoi(memTag); + } + + if (total) + *total = totalKBytes << 10; + return freeKBytes << 10; +#else + // Guess 48 MB. + if (total) + *total = 48<<20; + return 48<<20; +#endif +} + +// note CPUAFFINITY code used to reside here +void I_RegisterSysCommands(void) {} + +boolean I_InitNetwork(void) +{ + // this must exist, but this is actually handled in i_tcp.c + return false; +} diff --git a/src/dedicated/i_threads.c b/src/dedicated/i_threads.c new file mode 100644 index 000000000..f981fa961 --- /dev/null +++ b/src/dedicated/i_threads.c @@ -0,0 +1,364 @@ +// SONIC ROBO BLAST 2 +//----------------------------------------------------------------------------- +// Copyright (C) 2020-2023 by James R. +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- +/// \file i_threads.c +/// \brief Multithreading abstraction + +#if defined (__unix__) || (!defined(__APPLE__) && defined (UNIXCOMMON)) + +#include + +#include "../i_threads.h" +#include "../doomdef.h" + +typedef struct thread_s thread_t; + +struct thread_s +{ + thread_t *next; + void *userdata; + I_thread_fn func; + pthread_t thread; +}; + +// we use a linked list to avoid moving memory blocks when allocating new threads. +static thread_t *thread_list; +static pthread_mutex_t thread_lock = PTHREAD_MUTEX_INITIALIZER; + +static void *HandleThread(void *data) +{ + thread_t *thread = data; + thread->func(thread->userdata); + + pthread_mutex_lock(&thread_lock); + thread->func = NULL; + pthread_mutex_unlock(&thread_lock); + return NULL; +} + +void +I_spawn_thread ( + const char * name, + I_thread_fn entry, + void * userdata +) +{ + thread_t *thread; + (void)name; + + pthread_mutex_lock(&thread_lock); + thread = thread_list; + while (thread != NULL) + { + if (thread->func == NULL) + { + // join with the exited thread to release it's resources. + pthread_join(thread->thread, NULL); + break; + } + thread = thread->next; + } + if (thread == NULL) + { + thread = malloc(sizeof(thread_t)); + thread->next = thread_list; + thread_list = thread; + } + + thread->func = entry; + thread->userdata = userdata; + pthread_create(&thread->thread, NULL, HandleThread, thread); + pthread_mutex_unlock(&thread_lock); +} + +int I_thread_is_stopped(void) +{ + thread_t *thread; + pthread_mutex_lock(&thread_lock); + thread = thread_list; + while (thread != NULL) + { + if (thread->func != NULL) + { + pthread_mutex_unlock(&thread_lock); + return false; + } + thread = thread->next; + } + pthread_mutex_unlock(&thread_lock); + return true; +} + +void I_start_threads(void) +{ +} + +void I_stop_threads(void) +{ + thread_t *thread = thread_list; + while (thread != NULL) + { + // join with all threads here, since finished threads haven't been awaited yet. + pthread_join(thread->thread, NULL); + thread = thread->next; + } +} + +void I_lock_mutex(I_mutex *anchor) +{ + pthread_mutex_lock(&thread_lock); + if (*anchor == NULL) + { + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + + // SRB2 relies on lock recursion, so we need a mutex configured for that. + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + *anchor = malloc(sizeof(pthread_mutex_t)); + pthread_mutex_init(*anchor, &attr); + pthread_mutexattr_destroy(&attr); + } + pthread_mutex_unlock(&thread_lock); + pthread_mutex_lock(*anchor); +} + +void I_unlock_mutex(I_mutex id) +{ + pthread_mutex_unlock(id); +} + +void I_hold_cond(I_cond *cond_anchor, I_mutex mutex_id) +{ + I_Assert(mutex_id != NULL); + pthread_mutex_lock(&thread_lock); + if (*cond_anchor == NULL) + { + *cond_anchor = malloc(sizeof(pthread_cond_t)); + pthread_cond_init(*cond_anchor, NULL); + } + pthread_mutex_unlock(&thread_lock); + pthread_cond_wait(*cond_anchor, mutex_id); +} + +void I_wake_one_cond(I_cond *anchor) +{ + pthread_mutex_lock(&thread_lock); + if (*anchor == NULL) + { + *anchor = malloc(sizeof(pthread_cond_t)); + pthread_cond_init(*anchor, NULL); + } + pthread_mutex_unlock(&thread_lock); + pthread_cond_signal(*anchor); +} + +void I_wake_all_cond(I_cond *anchor) +{ + pthread_mutex_lock(&thread_lock); + if (*anchor == NULL) + { + *anchor = malloc(sizeof(pthread_cond_t)); + pthread_cond_init(*anchor, NULL); + } + pthread_mutex_unlock(&thread_lock); + pthread_cond_broadcast(*anchor); +} +#elif defined (_WIN32) +#include + +#include "../i_threads.h" +#include "../doomdef.h" +#include "../doomtype.h" + +typedef struct thread_s thread_t; + +struct thread_s +{ + thread_t *next; + void *userdata; + I_thread_fn func; + HANDLE thread; + DWORD thread_id; +}; + +// we use a linked list to avoid moving memory blocks when allocating new threads. +static thread_t *thread_list; +static CRITICAL_SECTION thread_lock; + +static DWORD __stdcall HandleThread(void *data) +{ + thread_t *thread = data; + thread->func(thread->userdata); + + EnterCriticalSection(&thread_lock); + thread->func = NULL; + LeaveCriticalSection(&thread_lock); + return 0; +} + +void I_spawn_thread(const char *name, I_thread_fn entry, void *userdata) +{ + thread_t *thread; + (void)name; + EnterCriticalSection(&thread_lock); + thread = thread_list; + while (thread != NULL) + { + if (thread->func == NULL) + { + CloseHandle(thread->thread); + break; + } + thread = thread->next; + } + if (thread == NULL) + { + thread = malloc(sizeof(thread_t)); + thread->next = thread_list; + thread_list = thread; + } + + thread->func = entry; + thread->userdata = userdata; + thread->thread = CreateThread(NULL, 0, HandleThread, thread, 0, &thread->thread_id); + LeaveCriticalSection(&thread_lock); +} + +int I_thread_is_stopped(void) +{ + thread_t *thread; + EnterCriticalSection(&thread_lock); + thread = thread_list; + while (thread != NULL) + { + if (thread->func != NULL) + { + LeaveCriticalSection(&thread_lock); + return false; + } + thread = thread->next; + } + LeaveCriticalSection(&thread_lock); + return true; +} + +void I_start_threads(void) +{ + InitializeCriticalSection(&thread_lock); +} + +void I_stop_threads(void) +{ + thread_t *thread = thread_list; + while (thread != NULL) + { + WaitForSingleObject(thread->thread, INFINITE); + CloseHandle(thread->thread); + thread = thread->next; + } + DeleteCriticalSection(&thread_lock); +} + +void I_lock_mutex(I_mutex *anchor) +{ + EnterCriticalSection(&thread_lock); + if (*anchor == NULL) + { + *anchor = malloc(sizeof(CRITICAL_SECTION)); + InitializeCriticalSection(*anchor); + } + LeaveCriticalSection(&thread_lock); + EnterCriticalSection(*anchor); +} + +void I_unlock_mutex(I_mutex id) +{ + LeaveCriticalSection(id); +} + +void I_hold_cond(I_cond *cond_anchor, I_mutex mutex_id) +{ + I_Assert(mutex_id != NULL); + EnterCriticalSection(&thread_lock); + if (*cond_anchor == NULL) + { + *cond_anchor = malloc(sizeof(CONDITION_VARIABLE)); + InitializeConditionVariable(*cond_anchor); + } + LeaveCriticalSection(&thread_lock); + SleepConditionVariableCS(*cond_anchor, mutex_id, INFINITE); +} + +void I_wake_one_cond(I_cond *anchor) +{ + EnterCriticalSection(&thread_lock); + if (*anchor == NULL) + { + *anchor = malloc(sizeof(CONDITION_VARIABLE)); + InitializeConditionVariable(*anchor); + } + LeaveCriticalSection(&thread_lock); + WakeConditionVariable(*anchor); +} + +void I_wake_all_cond(I_cond *anchor) +{ + EnterCriticalSection(&thread_lock); + if (*anchor == NULL) + { + *anchor = malloc(sizeof(CONDITION_VARIABLE)); + InitializeConditionVariable(*anchor); + } + LeaveCriticalSection(&thread_lock); + WakeAllConditionVariable(*anchor); +} +#else +void I_spawn_thread(const char *name, I_thread_fn entry, void *userdata) +{ + (void)name; + entry(userdata); +} + +int I_thread_is_stopped(void) +{ +} + +void I_start_threads(void) +{ +} + +void I_stop_threads(void) +{ +} + +void I_lock_mutex(I_mutex *anchor) +{ + (void)anchor; +} + +void I_unlock_mutex(I_mutex id) +{ + (void)id; +} + +void I_hold_cond(I_cond *cond_anchor, I_mutex mutex_id) +{ + (void)cond_anchor; + (void)mutex_id; +} + +void I_wake_one_cond(I_cond *anchor) +{ + (void)anchor; +} + +void I_wake_all_cond(I_cond *anchor) +{ + (void)anchor; +} +#endif diff --git a/src/dedicated/i_video.c b/src/dedicated/i_video.c new file mode 100644 index 000000000..6c0b6644a --- /dev/null +++ b/src/dedicated/i_video.c @@ -0,0 +1,154 @@ +// Emacs style mode select -*- C++ -*- +// SONIC ROBO BLAST 2 +//----------------------------------------------------------------------------- +// +// Copyright (C) 1993-1996 by id Software, Inc. +// Portions Copyright (C) 1998-2000 by DooM Legacy Team. +// Copyright (C) 2014-2018 by Sonic Team Junior. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +//----------------------------------------------------------------------------- +/// \file +/// \brief SRB2 graphics stuff for dedicated + +#include "../doomdef.h" +#include "../i_system.h" +#include "../i_video.h" +#include "../console.h" +#include "../command.h" +#include "../i_system.h" +#include "../screen.h" + +rendermode_t rendermode = render_none; + +boolean highcolor = false; + +// synchronize page flipping with screen refresh +consvar_t cv_vidwait = {"vid_wait", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + +static CV_PossibleValue_t keyboardlayout_cons_t[] = {{1,"Default US"}, {2, "Native"}, {3, "AZERTY"}, {0, NULL}}; +consvar_t cv_keyboardlayout = {"keyboardlayout", "Default US", CV_SAVE, keyboardlayout_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; + +consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + +INT32 numcontrollers = 0; + +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; +UINT16 realwidth = BASEVIDWIDTH; +UINT16 realheight = BASEVIDHEIGHT; + +extern boolean consolevent; + +void I_GetConsoleEvents(void); + +void I_GetEvent(void) +{ +} + +void I_StartupMouse(void) +{ +} + +// +// I_OsPolling +// +void I_OsPolling(void) +{ + if (consolevent) + I_GetConsoleEvents(); +} + +// +// I_UpdateNoBlit +// +void I_UpdateNoBlit(void) +{ +} + +// +// I_FinishUpdate +// +void I_FinishUpdate(void) +{ +} + +// +// I_UpdateNoVsync +// +void I_UpdateNoVsync(void) +{ +} + +// +// I_ReadScreen +// +void I_ReadScreen(UINT8 *scr) +{ + (void)scr; +} + +// +// I_SetPalette +// +void I_SetPalette(RGBA_t *palette) +{ + (void)palette; +} + +// return number of fullscreen + X11 modes +INT32 VID_NumModes(void) +{ + return 0; +} + +const char *VID_GetModeName(INT32 modenum) +{ + (void)modenum; + return NULL; +} + +INT32 VID_GetModeForSize(INT32 w, INT32 h) +{ + (void)w; + (void)h; + return -1; +} + +void VID_PrepareModeList(void) +{ +} + +INT32 VID_SetMode(INT32 modeNum) +{ + (void)modeNum; + return true; +} + +void I_StartupGraphics(void) +{ +} + +void I_ShutdownGraphics(void) +{ +} + +UINT32 I_GetRefreshRate(void) +{ + return 0; +} + +boolean I_UseNativeKeyboard(void) +{ + return false; +} diff --git a/src/g_game.c b/src/g_game.c index 200ce7834..3d2f37fac 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -8117,9 +8117,6 @@ void G_SaveDemo(void) UINT8 *p = demobuf.buffer+16; // after version UINT32 length; -#ifdef NOMD5 - UINT8 i; -#endif // Ensure extrainfo pointer is always available, even if no info is present. if (demoinfo_p && *(UINT32 *)demoinfo_p == 0) @@ -8174,7 +8171,7 @@ void G_SaveDemo(void) length = *(UINT32 *)demoinfo_p; WRITEUINT32(demoinfo_p, length); #ifdef NOMD5 - for (i = 0; i < 16; i++, p++) + for (UINT8 k = 0; k < 16; k++, p++) *p = M_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct. #else // Make a checksum of everything after the checksum in the file up to the end of the standard data. Extrainfo is freely modifiable. diff --git a/src/hardware/Sourcefile b/src/hardware/Sourcefile new file mode 100644 index 000000000..3114c975c --- /dev/null +++ b/src/hardware/Sourcefile @@ -0,0 +1,14 @@ +hw_bsp.c +hw_draw.c +hw_main.c +hw_clip.c +hw_md2.c +hw_cache.c +hw_md2load.c +hw_md3load.c +hw_model.c +hw_portal.c +hw_batching.c +hw_shaders.c +u_list.c +r_opengl/r_opengl.c diff --git a/src/m_menu.c b/src/m_menu.c index 2fb38a4d5..842f22d44 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -7133,7 +7133,7 @@ static void DrawReplayHutReplayInfo(void) case MD_OUTDATED: V_DrawThinString(17, 64, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT|highlightflags, va("Recorded on an outdated version. %s", demolist[dir_on[menudepthleft]].version)); - /*fallthru*/ + /* FALLTHRU */ default: // Draw level stuff x = 15; y = 15; diff --git a/src/m_misc.c b/src/m_misc.c index c44086f4c..9455608cb 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -55,12 +55,13 @@ #ifdef HAVE_SDL #include "sdl/hwsym_sdl.h" +#endif + #ifdef __linux__ #ifndef _LARGEFILE64_SOURCE typedef off_t off64_t; #endif #endif -#endif #if defined(__MINGW32__) && ((__GNUC__ > 7) || (__GNUC__ == 6 && __GNUC_MINOR__ >= 3)) && (__GNUC__ < 8) #define PRIdS "u" diff --git a/src/p_mobj.c b/src/p_mobj.c index 0157963f9..06cbd3b17 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7025,7 +7025,7 @@ void P_MobjThinker(mobj_t *mobj) P_RemoveMobj(mobj); return; } - // fallthru + /* FALLTHRU */ case MT_ORBINAUT_SHIELD: case MT_BANANA_SHIELD: case MT_EGGMANITEM_SHIELD: @@ -7035,7 +7035,7 @@ void P_MobjThinker(mobj_t *mobj) case MT_JAWZ_DUD: if (P_IsObjectOnGround(mobj)) P_SetMobjState(mobj, mobj->info->xdeathstate); - // fallthru + /* FALLTHRU */ case MT_JAWZ_SHIELD: mobj->flags2 ^= MF2_DONTDRAW; break; diff --git a/src/sdl/Sourcefile b/src/sdl/Sourcefile new file mode 100644 index 000000000..82d5ce073 --- /dev/null +++ b/src/sdl/Sourcefile @@ -0,0 +1,7 @@ +i_net.c +i_system.c +i_main.c +i_video.c +dosstr.c +endtxt.c +hwsym_sdl.c diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c index d6a007919..f033b678a 100644 --- a/src/sdl/i_main.c +++ b/src/sdl/i_main.c @@ -20,7 +20,7 @@ #include "../doomdef.h" #include "../m_argv.h" #include "../d_main.h" -#include "../m_misc.h"/* path shit */ +#include "../m_misc.h" /* path shit */ #include "../i_system.h" #if defined (__GNUC__) || defined (__unix__) diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index b0890913a..afda0caa2 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -743,7 +743,7 @@ static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co) break; case VK_RETURN: entering_con_command = false; - // Fall through. + /* FALLTHRU */ default: //event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char event.data1 = evt.uChar.AsciiChar; diff --git a/src/w_wad.c b/src/w_wad.c index 0c7fdbaf0..ff2938c3e 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -724,7 +724,9 @@ UINT16 W_InitFile(const char *filename, boolean local) wadfile_t *wadfile; restype_t type; UINT16 numlumps = 0; +#ifndef NOMD5 size_t i; +#endif UINT8 md5sum[16]; boolean important; From 8c316827230fa92530c4eac743449f62f6603881 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 15:43:21 +0200 Subject: [PATCH 08/62] smol adjustments for main --- src/Makefile.d/versions.mk | 4 ++++ src/Sourcefile | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Makefile.d/versions.mk b/src/Makefile.d/versions.mk index 7c130d908..a3cdbbd4b 100644 --- a/src/Makefile.d/versions.mk +++ b/src/Makefile.d/versions.mk @@ -17,6 +17,10 @@ $(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\ $(eval $(call _predecessor,$(subst =, ,$(v)))))) # -W -Wno-unused + +ifdef GCC150 + opts+=-std=gnu17 +endif WFLAGS:=-Wall -Wno-trigraphs ifndef GCC295 #WFLAGS+=-Wno-packed diff --git a/src/Sourcefile b/src/Sourcefile index 4d117111d..227e6c95a 100644 --- a/src/Sourcefile +++ b/src/Sourcefile @@ -94,4 +94,3 @@ lua_skinlib.c lua_thinkerlib.c lua_udatalib.c lua_glib.c -hashtable.c From 8b2e6ea17bed2ccb4be5083d6213bc628e999f20 Mon Sep 17 00:00:00 2001 From: Indev Date: Wed, 28 May 2025 16:54:37 +0300 Subject: [PATCH 09/62] libpeethread --- src/Makefile.d/dedicated.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Makefile.d/dedicated.mk b/src/Makefile.d/dedicated.mk index 698ea5531..fef452467 100644 --- a/src/Makefile.d/dedicated.mk +++ b/src/Makefile.d/dedicated.mk @@ -4,10 +4,7 @@ sources+=$(call List,dedicated/Sourcefile) opts+=-DDEDICATED -ifdef FREEBSD -# on FreeBSD, we have to link to libpthread explicitly libs+=-lpthread -endif ifdef MINGW libs+=-mconsole From 393ade780cc8b7193af238eea11d5a4f5ba3e895 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 14:42:42 +0100 Subject: [PATCH 10/62] add missing "time" include from dedi i_system --- src/dedicated/i_system.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c index e568873f0..58840b1d3 100644 --- a/src/dedicated/i_system.c +++ b/src/dedicated/i_system.c @@ -131,6 +131,8 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #include #endif +#include + // Locations for searching the srb2.srb #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) #define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart" From b6923d0d0dc7e4ee18d4ac3a7507c7dbb0a95a63 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 16:18:13 +0200 Subject: [PATCH 11/62] 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 1219ecf818581959f6afab9ced175904816c2f92 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 16:26:26 +0200 Subject: [PATCH 12/62] check for 32bit with __SIZEOF_POINTER__ for precip drawdistance thx @chromaticpipe for the tip! --- src/r_main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/r_main.c b/src/r_main.c index 5a7d77acd..f16d138ee 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -125,16 +125,17 @@ static CV_PossibleValue_t drawdist_cons_t[] = { {8192, "8192"}, {12288, "12288"}, {20480, "20480"}, {24576, "24576"},{0, "Infinite"}, {0, NULL}}; -#if defined(__x86_64__) || defined(__amd64__) || defined(__aarch64__) || defined(__arm64__) // only for 64bit (idk how else to proper check lmao) +#if __SIZEOF_POINTER__ < 8 // only for 64bit static CV_PossibleValue_t drawdist_precip_cons_t[] = { - {256, "256"}, {512, "512"}, {768, "768"}, + {256, "256"}, {512, "512"}, {768, "768"}, {1024, "1024"}, {1536, "1536"}, {2048, "2048"}, - {3072, "3072"}, {4096, "4096"}, {0, "None"}, {0, NULL}}; + {0, "None"}, {0, NULL}}; + #else static CV_PossibleValue_t drawdist_precip_cons_t[] = { - {256, "256"}, {512, "512"}, {768, "768"}, - {1024, "1024"}, {1536, "1536"}, {2048, "2048"}, - {0, "None"}, {0, NULL}}; + {256, "256"}, {512, "512"}, {768, "768"}, + {1024, "1024"}, {1536, "1536"}, {2048, "2048"}, + {3072, "3072"}, {4096, "4096"}, {0, "None"}, {0, NULL}}; #endif static CV_PossibleValue_t maxinterpdist_cons_t[] = { From 18914f22f20e204917d50824645639b6ee0418b0 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 18:29:18 +0200 Subject: [PATCH 13/62] remove crappy memcpy redifine from md5 --- src/md5.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/md5.c b/src/md5.c index 66d563666..8292fb9ee 100644 --- a/src/md5.c +++ b/src/md5.c @@ -26,12 +26,6 @@ #if defined (STDC_HEADERS) || defined (_LIBC) #include -#else - #ifndef HAVE_MEMCPY - #if !(defined (_WIN32) && !defined (__CYGWIN__)) && !defined (__APPLE__) - #define memcpy(d, s, n) bcopy ((s), (d), (n)) - #endif - #endif #endif #include "md5.h" From 346dee019ca4e7571be7baf83104e2bd43c2b17b Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 18:30:26 +0200 Subject: [PATCH 14/62] 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 19e5366c5bef6d2b98825a3fbc1847d614b2fa94 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 18:31:21 +0200 Subject: [PATCH 15/62] add wireframe mode for ogl --- src/hardware/hw_main.c | 20 ++++++++++++++++++-- src/hardware/hw_main.h | 2 ++ src/hardware/r_opengl/r_opengl.c | 7 +++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 94767ff5d..0f308017d 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -226,6 +226,8 @@ consvar_t cv_glsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL, consvar_t cv_glbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_glwireframe = {"gr_wireframe", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + consvar_t cv_glrenderdistance = {"gr_renderdistance", "Max", CV_SAVE, glrenderdistance_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_glhorizonlines = {"gr_horizonlines", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -338,6 +340,12 @@ static void HWR_SetShaderState(void) GL_SetSpecialState(HWD_SET_SHADERS, HWR_UseShader() ? 1 : 0); } + +static boolean HWR_IsWireframeMode(void) +{ + return (cv_glwireframe.value /*&& cv_debug*/); +} + static boolean HWR_OverrideObjectLightLevel(mobj_t *thing, INT32 *lightlevel) { if (R_ThingIsFullBright(thing)) @@ -5259,6 +5267,9 @@ static void HWR_DrawSkyBackground(void) if (drewsky) return; + if (HWR_IsWireframeMode()) + return; + GL_SetBlend(PF_Translucent|PF_NoDepthTest|PF_Modulated); memcpy(&dometransform, &atransform, sizeof(FTransform)); @@ -5461,8 +5472,8 @@ void HWR_RenderViewpoint(gl_portal_t *rootportal, const float fpov, player_t *pl HWR_PortalClipping(rootportal); } - // Set transform. - GL_SetTransform(&atransform); + if (HWR_IsWireframeMode()) + GL_SetSpecialState(HWD_SET_WIREFRAME, 1); ps_numbspcalls.value.i = 0; ps_numpolyobjects.value.i = 0; @@ -5527,6 +5538,9 @@ void HWR_RenderViewpoint(gl_portal_t *rootportal, const float fpov, player_t *pl ps_hw_nodedrawtime.value.p = 0; HWR_RenderDrawNodes(); + if (HWR_IsWireframeMode()) + GL_SetSpecialState(HWD_SET_WIREFRAME, 0); + HWR_FreePortalList(portallist); } @@ -5801,6 +5815,8 @@ void HWR_AddCommands(void) CV_RegisterVar(&cv_glbatching); + CV_RegisterVar(&cv_glwireframe); + CV_RegisterVar(&cv_glrenderdistance); CV_RegisterVar(&cv_glhorizonlines); diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index b8d6ef939..87b1faaf4 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -202,6 +202,8 @@ extern consvar_t cv_glsolvetjoin; extern consvar_t cv_glbatching; +extern consvar_t cv_glwireframe; + extern consvar_t cv_glrenderdistance; extern consvar_t cv_glhorizonlines; diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 12ec0cd97..07ceaf86f 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -350,6 +350,8 @@ typedef void (APIENTRY * PFNglDisable) (GLenum cap); static PFNglDisable pglDisable; typedef void (APIENTRY * PFNglGetFloatv) (GLenum pname, GLfloat *params); static PFNglGetFloatv pglGetFloatv; +typedef void (APIENTRY * PFNglPolygonMode) (GLenum, GLenum); +static PFNglPolygonMode pglPolygonMode; /* Depth Buffer */ typedef void (APIENTRY * PFNglClearDepth) (GLclampd depth); @@ -549,6 +551,7 @@ boolean SetupGLfunc(void) GETOPENGLFUNC(pglGetFloatv, glGetFloatv) GETOPENGLFUNC(pglGetIntegerv, glGetIntegerv) GETOPENGLFUNC(pglGetString, glGetString) + GETOPENGLFUNC(pglPolygonMode, glPolygonMode) GETOPENGLFUNC(pglClearDepth, glClearDepth) GETOPENGLFUNC(pglDepthFunc, glDepthFunc) @@ -2364,6 +2367,10 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value) GL_Flush(); //??? if we want to change filter mode by texture, remove this break; + case HWD_SET_WIREFRAME: + pglPolygonMode(GL_FRONT_AND_BACK, Value ? GL_LINE : GL_FILL); + break; + case HWD_SET_TEXTURE_FORMAT: gltexformat = (Value == 32) ? GL_RGBA : GL_RGB5_A1; GL_Flush(); From f15d3be263cad5ee319646cad281ef89283ac730 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 16:37:37 +0100 Subject: [PATCH 16/62] forgor the hw state lel --- src/hardware/hw_defs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h index 08cce42c9..1da42770a 100644 --- a/src/hardware/hw_defs.h +++ b/src/hardware/hw_defs.h @@ -318,6 +318,8 @@ enum hwdsetspecialstate HWD_SET_TEXTUREFILTERMODE, HWD_SET_TEXTUREANISOTROPICMODE, + HWD_SET_WIREFRAME, + HWD_SET_MSAA, HWD_SET_SCREEN_TEXTURES, From ff474d18ee6a6c67ae315b55eba3b0177474f008 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 21:42:13 +0200 Subject: [PATCH 17/62] 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 a6898bd1cd8c091e356d22dd8fec91559c35f991 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 22:11:46 +0200 Subject: [PATCH 18/62] 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 7c34733eea9aa8f6c00bf71ca923722b016584a4 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 23:57:53 +0200 Subject: [PATCH 19/62] add nofork parameter to dedibuild --- src/dedicated/i_system.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c index 58840b1d3..6ab748f86 100644 --- a/src/dedicated/i_system.c +++ b/src/dedicated/i_system.c @@ -1439,7 +1439,10 @@ INT32 I_StartupSystem(void) { I_StartupConsole(); #ifdef NEWSIGNALHANDLER - I_Fork(); + // This is useful when debugging. It lets GDB attach to + // the correct process easily. + if (!M_CheckParm("-nofork")) + I_Fork(); #endif #ifdef HAVE_THREADS I_start_threads(); From fb9c459269aff534af9ef239bf62a19bb7af7c71 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 11:47:37 +0200 Subject: [PATCH 20/62] 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 5e532a76cfba090a8150d72c7ec0cb018cde4c39 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 11:49:43 +0200 Subject: [PATCH 21/62] reset the palette earlier during levelload generally make this behave like srb2/rr again --- src/p_setup.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index fe3a0d7fc..57894c074 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2807,6 +2807,10 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) CON_Drawer(); // let the user know what we are going to do I_FinishUpdate(); // page flip or blit buffer + // Reset the palette + if (rendermode != render_none) + V_SetPaletteLump("PLAYPAL"); + // Initialize sector node list. P_Initsecnode(); @@ -2878,10 +2882,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) // Reset the palette now all fades have been done if (rendermode != render_none) - { - //V_ResetPaletteCVars(); // dont carry over changed palettes - V_SetPaletteLump(GetPalette()); // Set the level palette - } + V_ReloadPalette(); // Set the level palette // Print "SPEEDING OFF TO [ZONE] [ACT 1]..." /*if (rendermode != render_none) From e88093d9cf2a129a26ae05049a79c32294c84fb1 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 11:50:08 +0200 Subject: [PATCH 22/62] 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 57894c074..47327e3ca 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2872,12 +2872,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 a364068abbbe8f10316dc80f0c6cf6171e166363 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 13:26:52 +0200 Subject: [PATCH 23/62] 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 200ce7834..dd3823f8a 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3998,7 +3998,6 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool } } - char *G_BuildMapTitle(INT32 mapnum) { char *title = NULL; @@ -6068,15 +6067,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 2fb38a4d5..65dab3e6a 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -7167,8 +7167,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."); @@ -8120,6 +8123,9 @@ UINT8 skyRoomMenuTranslations[MAXUNLOCKABLES]; static char *M_GetConditionString(condition_t cond) { + char *title = NULL; + char *response = NULL; + switch(cond.type) { case UC_PLAYTIME: @@ -8146,33 +8152,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 cf42c35b9fda511217a4dc72c58d8275cb6b5742 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 13:29:25 +0200 Subject: [PATCH 24/62] 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 eca9c60d9b8a9122fe9078462e615b8f9b3ba4dc Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 17:58:00 +0200 Subject: [PATCH 25/62] 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 0f308017d..51f3346dc 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -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); } } else @@ -5778,7 +5778,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 bf44a054a1a614d1756813fec90311d6e708897c Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 18:17:07 +0200 Subject: [PATCH 26/62] 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 fe682a80712a4bc9a4d78a46539f5d1af0682caa Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 18:57:36 +0200 Subject: [PATCH 27/62] only make screentexture for postprocess if we need to gives quite a neat perfboost on the gpu side --- src/hardware/hw_main.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 51f3346dc..af8a6e160 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -340,7 +340,6 @@ static void HWR_SetShaderState(void) GL_SetSpecialState(HWD_SET_SHADERS, HWR_UseShader() ? 1 : 0); } - static boolean HWR_IsWireframeMode(void) { return (cv_glwireframe.value /*&& cv_debug*/); @@ -4235,7 +4234,6 @@ static void *HWR_CreateDrawNode(gl_drawnode_type_t type) Z_Realloc(drawnodes, alloceddrawnodes * sizeof(gl_drawnode_t), PU_LEVEL, &drawnodes); } - drawnode = &drawnodes[numdrawnodes++]; drawnode->type = type; @@ -5889,7 +5887,6 @@ static void COM_HWR_glinfo(void) CONS_Printf("Unrecognized argument: %s\n", argv); return; } - } CONS_Printf("\x88OpenGL %s\x80\n", gl_version); @@ -5983,7 +5980,7 @@ static void HWR_DoPostProcessor(player_t *player) // Armageddon Blast Flash! // Could this even be considered postprocessor? - if (!HWR_PalRenderFlashpal() && player->flashcount) + if (player->flashcount && !HWR_PalRenderFlashpal()) { FOutVector v[4]; FSurfaceInfo Surf; @@ -6009,19 +6006,19 @@ static void HWR_DoPostProcessor(player_t *player) if (cv_glscreentextures.value != 2) // screen textures are needed for the rest of the effects return; - // Capture the screen for intermission and screen waving - if (gamestate != GS_INTERMISSION) - GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1); - - if (splitscreen) // Not supported in splitscreen - someone want to add support? - return; - - //UINT8 viewnum = R_GetViewNumber(); // see above + //UINT8 viewnum = R_GetViewNumber(); // see below //camera_t *thiscam = &camera[viewnum]; camera_t *thiscam = &camera[0]; + // Not supported in splitscreen - someone want to add support? + const boolean screenwave = (!splitscreen && (thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT)); + + // Capture the screen for intermission and screen waving + if ((lastdraw || screenwave) && gamestate != GS_INTERMISSION) + GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1); + // Drunken vision! WooOOooo~ - if (thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT) + if (screenwave) { // 10 by 10 grid. 2 coordinates (xy) float v[SCREENVERTS][SCREENVERTS][2]; @@ -6055,6 +6052,7 @@ static void HWR_DoPostProcessor(player_t *player) v[x][y][1] = (y/((float)(SCREENVERTS-1.0f)/9.0f))-4.5f; } } + GL_PostImgRedraw(v); // Capture the screen again for screen waving on the intermission From 57b2316c42074ce02eccfa2c71e06303fd98adfb Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 18:59:27 +0200 Subject: [PATCH 28/62] didnt mean to change this lel --- src/hardware/hw_main.c | 2 +- src/hardware/hw_main.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index af8a6e160..e25364bee 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5980,7 +5980,7 @@ static void HWR_DoPostProcessor(player_t *player) // Armageddon Blast Flash! // Could this even be considered postprocessor? - if (player->flashcount && !HWR_PalRenderFlashpal()) + if (!HWR_PalRenderFlashpal() && player->flashcount) { FOutVector v[4]; FSurfaceInfo Surf; diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index 87b1faaf4..6dc0d23a6 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -225,7 +225,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 c5b72f24b5ea6044047d240b5b422fed92624427 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 17:16:51 +0100 Subject: [PATCH 29/62] thanks windoze very cool --- src/Makefile.d/win32.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk index 353c666ee..38b437fed 100644 --- a/src/Makefile.d/win32.mk +++ b/src/Makefile.d/win32.mk @@ -38,7 +38,7 @@ libs+=-lws2_32 endif ifndef MINGW64 -libs+=--large-address-aware +#libs+=--large-address-aware NOLIBBACKTRACE=1 endif From f5cb473f3dbe6d1c669e657796e0720d4925a9eb Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 17:27:38 +0100 Subject: [PATCH 30/62] thanks windoze very cool part 2 --- src/Makefile.d/win32.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk index 38b437fed..4946c4ca2 100644 --- a/src/Makefile.d/win32.mk +++ b/src/Makefile.d/win32.mk @@ -38,7 +38,7 @@ libs+=-lws2_32 endif ifndef MINGW64 -#libs+=--large-address-aware +libs+=-Wl,--large-address-aware NOLIBBACKTRACE=1 endif From c05068f22fff7b0e7955221bf1f09cd1b85e6efe Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 19:35:15 +0200 Subject: [PATCH 31/62] why are those still here lel --- src/blua/Makefile.cfg | 55 --------------- src/sdl/MakeCYG.cfg | 16 ----- src/sdl/MakeNIX.cfg | 76 -------------------- src/sdl/Makefile.cfg | 106 ---------------------------- src/win32/Makefile.cfg | 154 ----------------------------------------- 5 files changed, 407 deletions(-) delete mode 100644 src/blua/Makefile.cfg delete mode 100644 src/sdl/MakeCYG.cfg delete mode 100644 src/sdl/MakeNIX.cfg delete mode 100644 src/sdl/Makefile.cfg delete mode 100644 src/win32/Makefile.cfg diff --git a/src/blua/Makefile.cfg b/src/blua/Makefile.cfg deleted file mode 100644 index f3d38fb70..000000000 --- a/src/blua/Makefile.cfg +++ /dev/null @@ -1,55 +0,0 @@ -ifdef UNIXCOMMON -LUA_CFLAGS+=-DLUA_USE_POSIX -endif -ifdef LINUX -LUA_CFLAGS+=-DLUA_USE_POSIX -endif -ifdef GCC43 -ifndef GCC44 -WFLAGS+=-Wno-logical-op -endif -endif - -OBJS:=$(OBJS) \ - $(OBJDIR)/lapi.o \ - $(OBJDIR)/lbaselib.o \ - $(OBJDIR)/ldo.o \ - $(OBJDIR)/ldblib.o \ - $(OBJDIR)/lfunc.o \ - $(OBJDIR)/linit.o \ - $(OBJDIR)/liolib.o \ - $(OBJDIR)/llex.o \ - $(OBJDIR)/lmem.o \ - $(OBJDIR)/lobject.o \ - $(OBJDIR)/lstate.o \ - $(OBJDIR)/lstrlib.o \ - $(OBJDIR)/ltablib.o \ - $(OBJDIR)/lundump.o \ - $(OBJDIR)/lzio.o \ - $(OBJDIR)/lauxlib.o \ - $(OBJDIR)/lcode.o \ - $(OBJDIR)/ldebug.o \ - $(OBJDIR)/ldump.o \ - $(OBJDIR)/lgc.o \ - $(OBJDIR)/lopcodes.o \ - $(OBJDIR)/lparser.o \ - $(OBJDIR)/lstring.o \ - $(OBJDIR)/ltable.o \ - $(OBJDIR)/ltm.o \ - $(OBJDIR)/lvm.o \ - $(OBJDIR)/lua_script.o \ - $(OBJDIR)/lua_baselib.o \ - $(OBJDIR)/lua_blockmaplib.o \ - $(OBJDIR)/lua_mathlib.o \ - $(OBJDIR)/lua_hooklib.o \ - $(OBJDIR)/lua_consolelib.o \ - $(OBJDIR)/lua_infolib.o \ - $(OBJDIR)/lua_mobjlib.o \ - $(OBJDIR)/lua_playerlib.o \ - $(OBJDIR)/lua_skinlib.o \ - $(OBJDIR)/lua_thinkerlib.o \ - $(OBJDIR)/lua_maplib.o \ - $(OBJDIR)/lua_hudlib.o \ - $(OBJDIR)/lua_hudlib_drawlist.o \ - $(OBJDIR)/lua_udatalib.o \ - $(OBJDIR)/lua_glib.o diff --git a/src/sdl/MakeCYG.cfg b/src/sdl/MakeCYG.cfg deleted file mode 100644 index b78316b00..000000000 --- a/src/sdl/MakeCYG.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# -# sdl/makeCYG.cfg for SRB2/Cygwin -# - -# -#Cygwin, for debugging - - NOHW=1 - NOHS=1 - - OPTS+=-DLINUX - - i_system_o+=$(OBJDIR)/SRB2.res - - # name of the exefile - EXENAME?=lsdlsrb2.exe diff --git a/src/sdl/MakeNIX.cfg b/src/sdl/MakeNIX.cfg deleted file mode 100644 index 81991793e..000000000 --- a/src/sdl/MakeNIX.cfg +++ /dev/null @@ -1,76 +0,0 @@ -# -# sdl/makeNIX.cfg for SRB2/?nix -# - -#Valgrind support -ifdef VALGRIND -VALGRIND_PKGCONFIG?=valgrind -VALGRIND_CFLAGS?=$(shell $(PKG_CONFIG) $(VALGRIND_PKGCONFIG) --cflags) -VALGRIND_LDFLAGS?=$(shell $(PKG_CONFIG) $(VALGRIND_PKGCONFIG) --libs) -ZDEBUG=1 -LIBS+=$(VALGRIND_LDFLAGS) -ifdef GCC46 -WFLAGS+=-Wno-error=unused-but-set-variable -WFLAGS+=-Wno-unused-but-set-variable -endif -endif - -# -#here is GNU/Linux and other -# - - OPTS=-DUNIXCOMMON - -#Use -rdynamic so a backtrace log shows function names instead of addresses - LDFLAGS+=-rdynamic - - #LDFLAGS = -L/usr/local/lib - LIBS=-lm -ifdef LINUX - LIBS+=-lrt -ifdef NOTERMIOS - OPTS+=-DNOTERMIOS -endif -endif - -ifdef LINUX64 - OPTS+=-DLINUX64 -endif - -# -#here is Solaris -# -ifdef SOLARIS - NOIPX=1 - OPTS+=-DSOLARIS -DINADDR_NONE=INADDR_ANY -DBSD_COMP - OPTS+=-I/usr/local/include -I/opt/sfw/include - LDFLAGS+=-L/opt/sfw/lib - LIBS+=-lsocket -lnsl -endif - -# -#here is FreeBSD -# -ifdef FREEBSD - OPTS+=-DLINUX -DFREEBSD -I/usr/X11R6/include - SDL_CONFIG?=sdl11-config - LDFLAGS+=-L/usr/X11R6/lib - LIBS+=-lkvm -lexecinfo -endif - -# -#here is Mac OS X -# -ifdef MACOSX - OBJS+=$(OBJDIR)/mac_resources.o - OBJS+=$(OBJDIR)/mac_alert.o - LIBS+=-framework CoreFoundation -endif - -ifndef NOHW - OPTS+=-I/usr/X11R6/include - LDFLAGS+=-L/usr/X11R6/lib -endif - - # name of the exefile - EXENAME?=lsdl2srb2kart diff --git a/src/sdl/Makefile.cfg b/src/sdl/Makefile.cfg deleted file mode 100644 index 3cf04509b..000000000 --- a/src/sdl/Makefile.cfg +++ /dev/null @@ -1,106 +0,0 @@ -# -# sdl/makefile.cfg for SRB2/SDL -# - -# -#SDL...., *looks at Alam*, THIS IS A MESS! -# - -ifdef UNIXCOMMON -include sdl/MakeNIX.cfg -endif - -ifdef PANDORA -include sdl/SRB2Pandora/Makefile.cfg -endif #ifdef PANDORA - -ifdef CYGWIN32 -include sdl/MakeCYG.cfg -endif #ifdef CYGWIN32 - -ifdef SDL_PKGCONFIG -SDL_CFLAGS?=$(shell $(PKG_CONFIG) $(SDL_PKGCONFIG) --cflags) -SDL_LDFLAGS?=$(shell $(PKG_CONFIG) $(SDL_PKGCONFIG) --libs) -else -ifdef PREFIX - SDL_CONFIG?=$(PREFIX)-sdl2-config -else - SDL_CONFIG?=sdl2-config -endif - -ifdef STATIC - SDL_CFLAGS?=$(shell $(SDL_CONFIG) --cflags) - SDL_LDFLAGS?=$(shell $(SDL_CONFIG) --static-libs) -else - SDL_CFLAGS?=$(shell $(SDL_CONFIG) --cflags) - SDL_LDFLAGS?=$(shell $(SDL_CONFIG) --libs) -endif -endif - - - OBJS+=$(OBJDIR)/i_video.o $(OBJDIR)/dosstr.o $(OBJDIR)/endtxt.o $(OBJDIR)/hwsym_sdl.o - - OPTS+=-DDIRECTFULLSCREEN -DHAVE_SDL - -ifndef NOHW - OBJS+=$(OBJDIR)/r_opengl.o $(OBJDIR)/ogl_sdl.o -endif - -ifdef NOMIXER - i_sound_o=$(OBJDIR)/sdl_sound.o -else - i_sound_o=$(OBJDIR)/mixer_sound.o - OPTS+=-DHAVE_MIXER - SDL_LDFLAGS+=-lSDL2_mixer -endif - -ifndef NOTHREADS - OPTS+=-DHAVE_THREADS - OBJS+=$(OBJDIR)/i_threads.o -endif - -ifdef SDL_TTF - OPTS+=-DHAVE_TTF - SDL_LDFLAGS+=-lSDL2_ttf -lfreetype -lz - OBJS+=$(OBJDIR)/i_ttf.o -endif - -ifdef SDL_IMAGE - OPTS+=-DHAVE_IMAGE - SDL_LDFLAGS+=-lSDL2_image -endif - -ifdef SDL_NET - OPTS+=-DHAVE_SDLNET - SDL_LDFLAGS+=-lSDL2_net -endif - -ifdef MINGW -ifndef NOSDLMAIN - SDLMAIN=1 -endif -endif - -ifdef SDLMAIN - OPTS+=-DSDLMAIN -else -ifdef MINGW - SDL_CFLAGS+=-Umain - SDL_LDFLAGS+=-mconsole -endif -endif - -ifndef NOLIBBACKTRACE - OPTS+=-DHAVE_LIBBACKTRACE -ifdef MINGW64 - CPPFLAGS+=-I../libs/libbacktrace/include - LDFLAGS+=-L../libs/libbacktrace/lib/x86_64 -endif - LIBS:=-lbacktrace $(LIBS) -endif - -CFLAGS+=$(SDL_CFLAGS) -LIBS:=$(SDL_LDFLAGS) $(LIBS) -ifdef STATIC - LIBS+=$(shell $(SDL_CONFIG) --static-libs) -endif diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg deleted file mode 100644 index 4f8b39485..000000000 --- a/src/win32/Makefile.cfg +++ /dev/null @@ -1,154 +0,0 @@ -# -# win32/Makefile.cfg for SRB2/Minwgw -# - -# -#Mingw, if you don't know, that's Win32/Win64 -# - -ifdef MINGW64 - HAVE_LIBGME=1 - LIBGME_CFLAGS=-I../libs/gme/include - LIBGME_LDFLAGS=-L../libs/gme/win64 -lgme -ifdef HAVE_OPENMPT - LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc - LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86_64 -lopenmpt -endif - - SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main - SDL_LDFLAGS?=-L../libs/SDL2/x86_64-w64-mingw32/lib -L../libs/SDL2_mixer/x86_64-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -else - HAVE_LIBGME=1 - LIBGME_CFLAGS=-I../libs/gme/include - LIBGME_LDFLAGS=-L../libs/gme/win32 -lgme -ifdef HAVE_OPENMPT - LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc - LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86 -lopenmpt -endif - SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main - SDL_LDFLAGS?=-L../libs/SDL2/i686-w64-mingw32/lib -L../libs/SDL2_mixer/i686-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -endif - -ifndef NONET -ifndef MINGW64 #miniupnc is broken with MINGW64 - HAVE_MINIUPNPC=1 -endif -endif - -ifndef NO_DISCORDRPC - HAVE_DISCORDRPC=1 -endif - - OPTS=-DSTDC_HEADERS - -ifndef GCC44 - #OPTS+=-mms-bitfields -endif - - OPTS+=-D__USE_MINGW_ANSI_STDIO=0 - - LIBS+=-ladvapi32 -lkernel32 -lmsvcrt -luser32 -ifdef MINGW64 - LIBS+=-lws2_32 -else -ifdef NO_IPV6 - LIBS+=-lwsock32 -else - LIBS+=-lws2_32 -endif -endif - -ifndef MINGW64 - CPPFLAGS+=-I../libs/drmingw/include - LDFLAGS+=-L../libs/drmingw/lib/win32 - LIBS+=-lmgwhelp -lexchndl -endif - - # name of the exefile - EXENAME?=srb2kart-saturn.exe - - i_system_o+=$(OBJDIR)/SRB2.res - #i_main_o+=$(OBJDIR)/win_dbg.o -ifndef NOHW - OPTS+=-DUSE_WGL_SWAP -endif - -ZLIB_CFLAGS?=-I../libs/zlib -ifdef MINGW64 -ZLIB_LDFLAGS?=-L../libs/zlib/win32 -lz64 -else -ZLIB_LDFLAGS?=-L../libs/zlib/win32 -lz32 -endif - -ifndef NOPNG -ifndef PNG_CONFIG - PNG_CFLAGS?=-I../libs/libpng-src -ifdef MINGW64 - PNG_LDFLAGS?=-L../libs/libpng-src/projects -lpng64 -else - PNG_LDFLAGS?=-L../libs/libpng-src/projects -lpng32 -endif #MINGW64 -endif #PNG_CONFIG -endif #NOPNG - -ifdef GETTEXT -ifndef CCBS - MSGFMT?=../libs/gettext/bin32/msgfmt.exe -endif -ifdef MINGW64 - CPPFLAGS+=-I../libs/gettext/include64 - LDFLAGS+=-L../libs/gettext/lib64 - LIBS+=-lmingwex -else - CPPFLAGS+=-I../libs/gettext/include32 - LDFLAGS+=-L../libs/gettext/lib32 - STATIC_GETTEXT=1 -endif #MINGW64 -ifdef STATIC_GETTEXT - LIBS+=-lasprintf -lintl -else - LIBS+=-lintl.dll -endif #STATIC_GETTEXT -endif #GETTEXT - -ifdef HAVE_MINIUPNPC - CPPFLAGS+=-I../libs/ -DSTATIC_MINIUPNPC -ifdef MINGW64 - LDFLAGS+=-L../libs/miniupnpc/mingw64 -else - LDFLAGS+=-L../libs/miniupnpc/mingw32 -endif #MINGW64 -endif - -ifndef NOCURL - CURL_CFLAGS+=-I../libs/curl/include -ifdef MINGW64 - CURL_LDFLAGS+=-L../libs/curl/lib64 -lcurl -else - CURL_LDFLAGS+=-L../libs/curl/lib32 -lcurl -endif #MINGW64 -endif - -ifdef HAVE_DISCORDRPC -ifdef MINGW64 - CPPFLAGS+=-I../libs/discord-rpc/win64-dynamic/include - LDFLAGS+=-L../libs/discord-rpc/win64-dynamic/lib -else - CPPFLAGS+=-I../libs/discord-rpc/win32-dynamic/include - LDFLAGS+=-L../libs/discord-rpc/win32-dynamic/lib -endif - LIBS+=-ldiscord-rpc -endif - -ifndef MINGW64 - LDFLAGS+=-Wl,--large-address-aware -endif - -ifndef MINGW64 - NOLIBBACKTRACE=1 -endif - -# disable dynamicbase if under msys2 -ifdef MSYSTEM - LDFLAGS+=-Wl,--disable-dynamicbase -endif From e47e58a98262c1666e8d85af68562efe24c545c1 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 29 May 2025 21:14:19 +0200 Subject: [PATCH 32/62] fixup ceepeepee support --- src/Makefile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/Makefile b/src/Makefile index e995b3ccf..cac95d35b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -134,6 +134,7 @@ include Makefile.d/util.mk ifdef PREFIX CC:=$(PREFIX)-gcc +CXX:=$(PREFIX)-g++ endif OBJDUMP_OPTS?=--wide --source --line-numbers @@ -270,15 +271,21 @@ opts+=$(WFLAGS) $(CPPFLAGS) $(CFLAGS) libs+=$(LDFLAGS) -lstdc++ asflags:=$(ASFLAGS) -x assembler-with-cpp +cxxopts:=$(opts) +cxxopts+=-std=c++17 +cxxopts+=$(CXXFLAGS) + cc=$(CC) cxx=$(CXX) ifdef DISTCC cc=distcc $(CC) +cxx=distcc $(CXX) endif ifdef CCACHE cc=ccache $(CC) +cxx=ccache $(CXX) endif ifndef SILENT @@ -293,8 +300,12 @@ SHELL ..... $(SHELL) CC ........ $(cc) +CXX ....... $(cxx) + CFLAGS .... $(opts) +CXXFLAGS .. $(cxxopts) + LDFLAGS ... $(libs) endef @@ -372,6 +383,19 @@ endif $(.)$(cc) -MM -MF $$@ -MT $(objdir)/$$*.o $(2) $$< endef +# dependency recipe template (C++) +# 1: source file suffix +# 2: extra flags to gcc +define _recipecxx = +$(depdir)/%.d : %.$(1) | $$$$(@D)/ +ifndef WINDOWSHELL +ifdef Echo_name + @printf '%-20.20s\r' $$< +endif +endif + $(.)$(cxx) -MM -MF $$@ -MT $(objdir)/$$*.o $(2) $$< +endef + $(eval $(call _recipe,c)) $(eval $(call _recipe,cpp)) $(eval $(call _recipe,s,$(asflags))) From 201c725dc7d2f90e8b636304767410df3f4043da Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 30 May 2025 02:19:13 +0200 Subject: [PATCH 33/62] cleanup d_main a little --- src/d_main.c | 247 ++++++++++++++++++++++++++------------------------- 1 file changed, 125 insertions(+), 122 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 728a1a760..d10ba05ab 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -197,12 +197,10 @@ static void D_PadMenuScrollInput(UINT8 input) // and pass it to the eventlist static void D_GamePadMenuScrollTicker(void) { + UINT8 i; static UINT8 menuInputDelayTimer = 0; - if (dedicated) - return; - - for (UINT8 i = 0; i < 4; i++) + for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) { if (dpadscrollstate[i]) { @@ -222,10 +220,10 @@ static void D_GamePadMenuScrollTicker(void) static void D_DeviceLEDTick(void) { UINT8 i; - static UINT16 color[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0}; - static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0}; + static UINT16 color[MAXSPLITSCREENPLAYERS] = {0}; + static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {0}; - if (dedicated || numcontrollers == 0) + if (numcontrollers == 0) { return; } @@ -252,7 +250,6 @@ static void D_DeviceLEDTick(void) void D_ProcessEvents(void) { event_t *ev; - boolean eaten; for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1)) @@ -291,8 +288,10 @@ void D_ProcessEvents(void) // Demo input: if (demo.playback) + { if (M_DemoResponder(ev)) continue; // demo ate the event + } // console input #ifdef HAVE_THREADS @@ -317,6 +316,88 @@ void D_ProcessEvents(void) // draw current display, possibly wiping it from the previous // +static void D_Renderview(void) +{ + UINT8 i; + + if (automapactive) + return; + + R_ApplyLevelInterpolators(rendertimefrac); + + for (i = 0; i <= splitscreen; i++) + { + const boolean issplitscreen = (i > 0); + + if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD) + { + viewssnum = i; + + if (!issplitscreen) // Initialize for P1 + { + viewwindowy = viewwindowx = 0; + topleft = screens[0]; + objectsdrawn = 0; + } + +#ifdef HWRENDER + if (rendermode == render_opengl) + { + HWR_RenderPlayerView(); + R_RestoreLevelInterpolators(); + return; + } +#endif + if (issplitscreen) // Splitscreen-specific + { + const INT32 len = viewheight*sizeof(ylookup[0]); + + switch (i) + { + case 1: + if (splitscreen > 1) + { + viewwindowx = viewwidth; + viewwindowy = 0; + } + else + { + viewwindowx = 0; + viewwindowy = viewheight; + } + M_Memcpy(ylookup, ylookup2, len); + break; + case 2: + viewwindowx = 0; + viewwindowy = viewheight; + M_Memcpy(ylookup, ylookup3, len); + break; + case 3: + viewwindowx = viewwidth; + viewwindowy = viewheight; + M_Memcpy(ylookup, ylookup4, len); + default: + break; + } + + topleft = screens[0] + viewwindowy*vid.width + viewwindowx; + } + + R_RenderPlayerView(&players[displayplayers[i]]); + + if (issplitscreen) + M_Memcpy(ylookup, ylookup1, viewheight*sizeof (ylookup[0])); + } + + if (!issplitscreen) + R_ApplyViewMorph(); + + V_DoPostProcessor(i, postimgparam[i]); + } + + R_RestoreLevelInterpolators(); +} + // wipegamestate can be set to -1 to force a wipe on the next draw // added comment : there is a wipe eatch change of the gamestate gamestate_t wipegamestate = GS_LEVEL; @@ -327,7 +408,6 @@ static boolean D_Display(void) boolean forcerefresh = false; static boolean wipe = false; INT32 wipedefindex = 0; - UINT8 i; if (!dedicated) { @@ -366,6 +446,7 @@ static boolean D_Display(void) { // set for all later wipedefindex = gamestate; // wipe_xxx_toblack + if (gamestate == GS_TITLESCREEN && wipegamestate != GS_INTRO) wipedefindex = wipe_timeattack_toblack; else if (gamestate == GS_INTERMISSION) @@ -378,26 +459,28 @@ static boolean D_Display(void) if (!dedicated) { - // Fade to black first - if (gamestate != GS_LEVEL // fades to black on its own timing, always - && wipedefs[wipedefindex] != UINT8_MAX) + if (gamestate != GS_LEVEL) { - F_WipeStartScreen(); - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); - F_WipeEndScreen(); - F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); - ranwipe = true; - } + // Fade to black first + if (wipedefs[wipedefindex] != UINT8_MAX) // fades to black on its own timing, always + { + F_WipeStartScreen(); + V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); + F_WipeEndScreen(); + F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); + ranwipe = true; + } - if (gamestate != GS_LEVEL && rendermode != render_none) - { - V_SetPaletteLump("PLAYPAL"); // Reset the palette - R_ReInitColormaps(0, LUMPERROR); + if (rendermode != render_none) + { + V_SetPaletteLump("PLAYPAL"); // Reset the palette + R_ReInitColormaps(0, LUMPERROR); + } } F_WipeStartScreen(); } - else //dedicated servers + else // dedicated servers { F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); ranwipe = true; @@ -405,7 +488,7 @@ static boolean D_Display(void) } } - if (dedicated) //bail out after wipe logic + if (dedicated) // bail out after wipe logic return false; // do buffered drawing @@ -430,9 +513,6 @@ static boolean D_Display(void) HU_Drawer(); break; - case GS_TIMEATTACK: - break; - case GS_INTRO: F_IntroDrawer(); if (wipegamestate == (gamestate_t)-1) @@ -484,6 +564,7 @@ static boolean D_Display(void) HU_Erase(); HU_Drawer(); } + case GS_TIMEATTACK: case GS_DEDICATEDSERVER: case GS_NULL: break; @@ -492,89 +573,10 @@ static boolean D_Display(void) if (gamestate == GS_LEVEL) { // draw the view directly - if (cv_renderview.value && !automapactive) + if (cv_renderview.value) { PS_START_TIMING(ps_rendercalltime); - - R_ApplyLevelInterpolators(rendertimefrac); - - for (i = 0; i <= splitscreen; i++) - { - if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD) - { - viewssnum = i; - - if (i == 0) // Initialize for P1 - { - viewwindowy = 0; - viewwindowx = 0; - - topleft = screens[0] + viewwindowy*vid.width + viewwindowx; - objectsdrawn = 0; - } - -#ifdef HWRENDER - if (rendermode == render_opengl) - HWR_RenderPlayerView(); - else -#endif - if (rendermode != render_none) - { - if (i > 0) // Splitscreen-specific - { - switch (i) - { - case 1: - if (splitscreen > 1) - { - viewwindowx = viewwidth; - viewwindowy = 0; - } - else - { - viewwindowx = 0; - viewwindowy = viewheight; - } - M_Memcpy(ylookup, ylookup2, viewheight*sizeof (ylookup[0])); - break; - case 2: - viewwindowx = 0; - viewwindowy = viewheight; - M_Memcpy(ylookup, ylookup3, viewheight*sizeof (ylookup[0])); - break; - case 3: - viewwindowx = viewwidth; - viewwindowy = viewheight; - M_Memcpy(ylookup, ylookup4, viewheight*sizeof (ylookup[0])); - default: - break; - } - - - topleft = screens[0] + viewwindowy*vid.width + viewwindowx; - } - - R_RenderPlayerView(&players[displayplayers[i]]); - - if (i > 0) - M_Memcpy(ylookup, ylookup1, viewheight*sizeof (ylookup[0])); - } - } - } - - if (rendermode == render_soft) - { - if (!splitscreen) - R_ApplyViewMorph(); - - for (i = 0; i <= splitscreen; i++) - { - V_DoPostProcessor(i, postimgparam[i]); - } - } - - R_RestoreLevelInterpolators(); - + D_Renderview(); PS_STOP_TIMING(ps_rendercalltime); } @@ -584,6 +586,7 @@ static boolean D_Display(void) { VID_BlitLinearScreen(screens[0], screens[1], vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.rowbytes); } + lastdraw = false; } @@ -606,13 +609,8 @@ static boolean D_Display(void) // draw pause pic if (paused && cv_showhud.value && !demo.playback) { - INT32 py; - patch_t *patch; - if (automapactive) - py = 4; - else - py = viewwindowy + 4; - patch = W_CachePatchName("M_PAUSE", PU_PATCH); + INT32 py = (automapactive) ? 4 : (viewwindowy + 4); + patch_t *patch = W_CachePatchName("M_PAUSE", PU_PATCH); V_DrawScaledPatch(viewwindowx + (BASEVIDWIDTH - patch->width)/2, py, V_SNAPTOTOP, patch); } @@ -754,7 +752,7 @@ void D_SRB2Loop(void) // Casting the return value of a function is bad practice (apparently) double budget = ((R_GetFramerateCap() == 0) ? 0.0 : round((1.0 / R_GetFramerateCap()) * I_GetPrecisePrecision())); - capbudget = (precise_t) budget; + capbudget = (precise_t)budget; boolean ranwipe = false; @@ -824,12 +822,15 @@ void D_SRB2Loop(void) doDisplay = true; } - if (menuactive) + if (!dedicated) { - D_GamePadMenuScrollTicker(); - } + if (menuactive) + { + D_GamePadMenuScrollTicker(); + } - D_DeviceLEDTick(); + D_DeviceLEDTick(); + } } if (interp) @@ -841,7 +842,9 @@ void D_SRB2Loop(void) ps_interp_frac.value.p = (precise_t)((FIXED_TO_FLOAT(g_time.timefrac)) * 1000.0f); ps_interp_lag.value.p = (precise_t)((deltasecs) * 1000.0f); - if (!(paused || P_AutoPause()) && deltatics < 1.0 && !hu_stopped) + const boolean lagging = ((deltatics >= 1.0) || hu_stopped); + + if (!(paused || P_AutoPause()) && !lagging) { rendertimefrac = g_time.timefrac; } @@ -850,7 +853,7 @@ void D_SRB2Loop(void) rendertimefrac = FRACUNIT; } - if ((deltatics < 1.0) && !hu_stopped) + if (!lagging) { rendertimefrac_unpaused = g_time.timefrac; } From 7d68c0598c89f66d2774c9b29d8a5bdb5300a209 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 30 May 2025 02:54:34 +0200 Subject: [PATCH 34/62] 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 27c053cd4832e5dbe8e94110fb19da251d12ee5b Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Fri, 30 May 2025 13:23:36 -0500 Subject: [PATCH 35/62] Add Server info screen, ported from SRB2Classic --- src/d_clisrv.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++--- src/d_clisrv.h | 3 ++ 2 files changed, 108 insertions(+), 5 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 4e5a1cd9a..a97c47987 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -87,6 +87,9 @@ boolean serverrunning = false; INT32 serverplayer = 0; char motd[254], server_context[8]; // Message of the Day, Unique Context (even without Mumble support) +plrinfo playerinfo[MAXPLAYERS]; +SINT8 joinnode = 0; // used for CL_VIEWSERVER + // Server specific vars UINT8 playernode[MAXPLAYERS]; @@ -1185,6 +1188,7 @@ typedef enum #endif CL_CONNECTED, CL_ABORTED, + CL_VIEWSERVER, CL_ASKFULLFILELIST, CL_CONFIRMCONNECT, #ifdef HAVE_CURL @@ -1248,7 +1252,7 @@ static inline void CL_DrawConnectionStatus(void) if (!menuactive) // menu already draws its own fade V_DrawFadeScreen(0xFF00, 16); // force default - if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_LOADFILES && cl_mode != CL_CHECKFILES + if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_LOADFILES && cl_mode != CL_CHECKFILES && cl_mode != CL_VIEWSERVER #ifdef HAVE_CURL && cl_mode != CL_DOWNLOADHTTPFILES #endif @@ -1368,6 +1372,78 @@ static inline void CL_DrawConnectionStatus(void) V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS, va(" %2u/%2u Files",loadcompletednum,fileneedednum)); } + else if (cl_mode == CL_VIEWSERVER) + { + V_DrawFill(8, 16, BASEVIDWIDTH - 16, 54, 239); + + V_DrawThinString(12 + 80, 18, V_ALLOWLOWERCASE, va("%s", serverlist[joinnode].info.servername)); + + const char *map = va("%sP", serverlist[joinnode].info.mapname); + patch_t *current_map = W_LumpExists(map) ? W_CachePatchName(map, PU_CACHE) : W_CachePatchName("BLANKLVL", PU_CACHE); + V_DrawSmallScaledPatch(10, 18, 0, current_map); + + V_DrawThinString(12 + 80, 38, V_ALLOWLOWERCASE, va("%s", serverlist[joinnode].info.maptitle)); + V_DrawThinString(12 + 80, 48, V_ALLOWLOWERCASE, va("%s", Gametype_Names[serverlist[joinnode].info.gametype])); + + if (fileneedednum > 0) + { + V_DrawThinString(12 + 80, 58, V_ALLOWLOWERCASE|V_ORANGEMAP, va("%i Addons", fileneedednum)); + } + else + { + V_DrawThinString(12 + 80, 58, V_ALLOWLOWERCASE|V_YELLOWMAP, "Vanilla"); + } + + if (serverlist[joinnode].info.cheatsenabled) + { + V_DrawRightAlignedThinString(BASEVIDWIDTH - 12, 58, V_ALLOWLOWERCASE|V_GREENMAP, "Cheats"); + } + + V_DrawFill(8, 72, BASEVIDWIDTH - 16, 112, 239); + + V_DrawString(12, 74, V_ALLOWLOWERCASE|V_YELLOWMAP, "Players"); + V_DrawRightAlignedString(BASEVIDWIDTH - 12, 74, V_ALLOWLOWERCASE|V_YELLOWMAP, va("%i / %i", serverlist[joinnode].info.numberofplayer, serverlist[joinnode].info.maxplayer)); + + INT32 i; + INT32 count = 0; + INT32 x = 14; + INT32 y = 84; + INT32 statuscolor = 1; + char player_name[MAXPLAYERNAME+1]; + if (serverlist[joinnode].info.numberofplayer > 0) + { + for (i = 0; i < MAXPLAYERS; i++) + { + if (playerinfo[i].node < 255) + { + strncpy(player_name, playerinfo[i].name, MAXPLAYERNAME); + V_DrawThinString(x + 10, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE, player_name); + + if (playerinfo[i].team == 0) { statuscolor = 184; } // playing + if (playerinfo[i].data & 0x20) { statuscolor = 86; } // tag IT + if (playerinfo[i].team == 1) { statuscolor = 128; } // ctf red team + if (playerinfo[i].team == 2) { statuscolor = 232; } // ctf blue team + if (playerinfo[i].team == 255) { statuscolor = 16; } // spectator or non-team + + V_DrawFill(x, y, 7, 7, 31); + V_DrawFill(x, y, 6, 6, statuscolor); + + y += 9; + count++; + if ((count == 11) || (count == 22)) + { + x += 104; + y = 84; + } + } + } + } + + // Buttons + V_DrawFill(8, BASEVIDHEIGHT - 14, BASEVIDWIDTH - 16, 12, 239); + V_DrawThinString(16, BASEVIDHEIGHT - 12, V_ALLOWLOWERCASE, va("[%sESC%s] = Abort", "\x82", "\x80")); + V_DrawRightAlignedThinString(BASEVIDWIDTH - 12, BASEVIDHEIGHT - 12, V_ALLOWLOWERCASE, va("[%sENTER%s] = Join", "\x82", "\x80")); + } else if (filedownload.current != -1) { INT32 dldlength; @@ -2495,7 +2571,7 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent) return true; } - cl_mode = CL_CHECKFILES; + cl_mode = CL_VIEWSERVER; } else { @@ -2549,7 +2625,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic case CL_ASKFULLFILELIST: if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved - cl_mode = CL_CHECKFILES; + cl_mode = CL_VIEWSERVER; else if (fileneedednum != cl_lastcheckedfilecount || I_GetTime() >= *asksent) { if (CL_AskFileList(fileneedednum)) @@ -2715,6 +2791,15 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic D_ProcessEvents(); //needed for menu system to receive inputs key = I_GetKey(); + + if (cl_mode == CL_VIEWSERVER) + { + if (gamekeydown[KEY_ENTER]) + cl_mode = CL_CHECKFILES; + else if (gamekeydown[KEY_ESCAPE]) + cl_mode = CL_ABORTED; + } + // Only ESC and non-keyboard keys abort connection if (!modeattacking && (key == KEY_ESCAPE || key == KEY_JOY1+1 || cl_mode == CL_ABORTED)) { @@ -4909,6 +4994,16 @@ static void HandleServerInfo(SINT8 node) if (client && cl_mode > CL_SEARCHING && node == servernode) memcpy(connectedservername, netbuffer->u.serverinfo.servername, MAXSERVERNAME); } + + +static void HandlePlayerInfo(SINT8 node) +{ + (void)node; + + INT32 i; + for (i = 0; i < MAXPLAYERS; i++) + playerinfo[i] = netbuffer->u.playerinfo[i]; +} #endif #ifdef SATURNPAK @@ -5197,6 +5292,10 @@ static void HandlePacketFromAwayNode(SINT8 node) case PT_CLIENTCMD: break; // This is not an "unknown packet" + + case PT_PLAYERINFO: + HandlePlayerInfo(node); + break; case PT_SERVERTICS: // Do not remove my own server (we have just get a out of order packet) @@ -5789,8 +5888,9 @@ static void GetPackets(void) } #endif - if (netbuffer->packettype == PT_PLAYERINFO) - continue; // We do nothing with PLAYERINFO, that's for the MS browser. + /*if (netbuffer->packettype == PT_PLAYERINFO) + continue; // We do nothing with PLAYERINFO, that's for the MS browser. Not quite true anymore :p*/ + // We also count unknown packets, hence "<=" if (netbuffer->packettype <= NUMPACKETTYPE) diff --git a/src/d_clisrv.h b/src/d_clisrv.h index 6202c8c52..221375c35 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -577,6 +577,9 @@ extern boolean acceptnewnode; extern SINT8 servernode; extern char connectedservername[MAXSERVERNAME+1]; +extern plrinfo playerinfo[MAXPLAYERS]; +extern SINT8 joinnode; + void Command_Ping_f(void); extern tic_t connectiontimeout; extern tic_t jointimeout; From c04ba992a7aeb108ae3ce40259eb8f5ff8089a12 Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Fri, 30 May 2025 13:26:27 -0500 Subject: [PATCH 36/62] Forgort something --- src/d_clisrv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index a97c47987..e27d454d3 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2545,6 +2545,7 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent) if (i < 0) return true; } + joinnode = i; // Quit here rather than downloading files and being refused later. if (serverlist[i].info.numberofplayer >= serverlist[i].info.maxplayer) From dd499a410f2dacf222a1c98fcab498c56dd36e23 Mon Sep 17 00:00:00 2001 From: chromaticpipe <127907268+chromaticpipe@users.noreply.github.com> Date: Fri, 30 May 2025 13:30:47 -0500 Subject: [PATCH 37/62] Very bad gamepad support --- src/d_clisrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index e27d454d3..30a450ee0 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2795,9 +2795,9 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic if (cl_mode == CL_VIEWSERVER) { - if (gamekeydown[KEY_ENTER]) + if (key == KEY_ENTER || key == KEY_JOY1) cl_mode = CL_CHECKFILES; - else if (gamekeydown[KEY_ESCAPE]) + else if (key == KEY_ESCAPE || key == KEY_JOY1+1) cl_mode = CL_ABORTED; } From 6617382f54298869c7a557bf2c7c69e04412543d Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 30 May 2025 23:59:08 +0200 Subject: [PATCH 38/62] Revert "reset the palette earlier during levelload" This reverts commit 5e532a76cfba090a8150d72c7ec0cb018cde4c39. --- src/p_setup.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 47327e3ca..0459a03f5 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2807,10 +2807,6 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) CON_Drawer(); // let the user know what we are going to do I_FinishUpdate(); // page flip or blit buffer - // Reset the palette - if (rendermode != render_none) - V_SetPaletteLump("PLAYPAL"); - // Initialize sector node list. P_Initsecnode(); @@ -2879,7 +2875,10 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) // Reset the palette now all fades have been done if (rendermode != render_none) - V_ReloadPalette(); // Set the level palette + { + //V_ResetPaletteCVars(); // dont carry over changed palettes + V_SetPaletteLump(GetPalette()); // Set the level palette + } // Print "SPEEDING OFF TO [ZONE] [ACT 1]..." /*if (rendermode != render_none) From 55c6ba6d12fb4222e6baf15cbc85ea8d7dd2b6d2 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 31 May 2025 15:57:03 +0200 Subject: [PATCH 39/62] 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 f16d138ee..15f17db9d 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1063,7 +1063,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; @@ -1169,7 +1169,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)); } @@ -1226,7 +1226,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); @@ -1235,7 +1235,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); @@ -1253,7 +1253,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); @@ -1262,7 +1262,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 5c53a90eea949af6f5316b260e78d1e297e0d494 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 31 May 2025 16:20:58 +0200 Subject: [PATCH 40/62] hack: reset musiccredits when changing gamestate otherwise they may persist if theyve been currently displayed --- src/g_game.c | 5 +++++ src/s_sound.c | 5 +++++ src/s_sound.h | 1 + 3 files changed, 11 insertions(+) diff --git a/src/g_game.c b/src/g_game.c index dd3823f8a..31eed2fd4 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -8234,6 +8234,11 @@ boolean G_DemoTitleResponder(event_t *ev) void G_SetGamestate(gamestate_t newstate) { gamestate = newstate; + + //HACK: reset musiccredits whenever we change gamestate + // since we allow them to run everywhere now + S_ResetMusicCredit(); + #ifdef HAVE_DISCORDRPC DRPC_UpdatePresence(); #endif diff --git a/src/s_sound.c b/src/s_sound.c index cf75df56a..2f79e0540 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1436,6 +1436,11 @@ musicdef_t *S_FindMusicCredit(const char *musname) return NULL; } +void S_ResetMusicCredit(void) +{ + memset(&cursongcredit, 0, sizeof(cursongcredit)); +} + // // S_ShowSpecifiedMusicCredit // diff --git a/src/s_sound.h b/src/s_sound.h index 92e206e1b..eec99d802 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -206,6 +206,7 @@ void S_InitMTDefs(void); musicdef_t *S_FindMusicCredit(const char *musname); void S_ShowSpecifiedMusicCredit(const char *musname); void S_ShowMusicCredit(void); +void S_ResetMusicCredit(void); boolean S_PrepareSoundTest(void); From 0e9a825f63d989309ef75a540531259d86ae942e Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 30 May 2025 20:52:38 +0200 Subject: [PATCH 41/62] 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 31eed2fd4..a872fc571 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -5464,33 +5464,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! @@ -8143,7 +8146,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 43b7f48ca..8d5b38bf2 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -1030,7 +1030,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 e25364bee..43cb25aed 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4464,7 +4464,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 f1f07822569149c6d94cd68c8c5c8b5f7ec2343d Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 30 May 2025 20:56:43 +0200 Subject: [PATCH 42/62] 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 a0f903f162669521d2548e10952d90ac5b4c64fd Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 31 May 2025 20:55:10 +0200 Subject: [PATCH 43/62] i like switches mhhhm --- src/hardware/hw_draw.c | 51 +++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c index 9fd90fb09..7e996e083 100644 --- a/src/hardware/hw_draw.c +++ b/src/hardware/hw_draw.c @@ -241,16 +241,16 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p if (option & V_SNAPTORIGHT) cx += (fvw - (FLOATBASEVIDWIDTH * dupx)); else if (!(option & V_SNAPTOLEFT)) - cx += (fvw - (FLOATBASEVIDWIDTH * dupx))/2; + cx += (fvw - (FLOATBASEVIDWIDTH * dupx))/2.0f; } if (fabsf(fvh - FLOATBASEVIDHEIGHT * dupy) > 1.0E-36f) { if ((option & (V_SPLITSCREEN|V_SNAPTOTOP)) == (V_SPLITSCREEN|V_SNAPTOTOP)) - cy += (fvh/2 - (FLOATBASEVIDHEIGHT/2 * dupy)); + cy += (fvh/2.0f - (FLOATBASEVIDHEIGHT/2.0f * dupy)); else if (option & V_SNAPTOBOTTOM) cy += (fvh - (FLOATBASEVIDHEIGHT * dupy)); else if (!(option & V_SNAPTOTOP)) - cy += (fvh - (FLOATBASEVIDHEIGHT * dupy))/2; + cy += (fvh - (FLOATBASEVIDHEIGHT * dupy))/2.0f; } } } @@ -305,10 +305,13 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p FSurfaceInfo Surf; Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff; - if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[hudtrans]; - else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[hudtrans]; - else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[hudtrans]; - else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; + switch (alphalevel) + { + case 13: Surf.PolyColor.s.alpha = softwaretranstogl_lo[hudtrans]; break; + case 14: Surf.PolyColor.s.alpha = softwaretranstogl[hudtrans]; break; + case 15: Surf.PolyColor.s.alpha = softwaretranstogl_hi[hudtrans]; break; + default: Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; break; + } flags |= PF_Modulated; GL_DrawPolygon(&Surf, v, 4, flags); @@ -392,16 +395,16 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, if (option & V_SNAPTORIGHT) cx += (fvw - (FLOATBASEVIDWIDTH * dupx)); else if (!(option & V_SNAPTOLEFT)) - cx += (fvw - (FLOATBASEVIDWIDTH * dupx))/2; + cx += (fvw - (FLOATBASEVIDWIDTH * dupx))/2.0f; } if (fabsf(fvh - FLOATBASEVIDHEIGHT * dupy) > 1.0E-36f) { if ((option & (V_SPLITSCREEN|V_SNAPTOTOP)) == (V_SPLITSCREEN|V_SNAPTOTOP)) - cy += (fvh/2 - (FLOATBASEVIDHEIGHT/2 * dupy)); + cy += (fvh/2.0f - (FLOATBASEVIDHEIGHT/2.0f * dupy)); else if (option & V_SNAPTOBOTTOM) cy += (fvh - (FLOATBASEVIDHEIGHT * dupy)); else if (!(option & V_SNAPTOTOP)) - cy += (fvh - (FLOATBASEVIDHEIGHT * dupy))/2; + cy += (fvh - (FLOATBASEVIDHEIGHT * dupy))/2.0f; } } } @@ -467,10 +470,13 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, FSurfaceInfo Surf; Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff; - if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[cv_translucenthud.value]; - else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[cv_translucenthud.value]; - else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[cv_translucenthud.value]; - else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; + switch (alphalevel) + { + case 13: Surf.PolyColor.s.alpha = softwaretranstogl_lo[cv_translucenthud.value]; break; + case 14: Surf.PolyColor.s.alpha = softwaretranstogl[cv_translucenthud.value]; break; + case 15: Surf.PolyColor.s.alpha = softwaretranstogl_hi[cv_translucenthud.value]; break; + default: Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; break; + } flags |= PF_Modulated; GL_DrawPolygon(&Surf, v, 4, flags); @@ -487,7 +493,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, // -------------------------------------------------------------------------- // Fills a box of pixels using a flat texture as a pattern // -------------------------------------------------------------------------- -void HWR_DrawFlatFill (INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum) +void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum) { FOutVector v[4]; double dflatsize; @@ -840,7 +846,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color) if (color & V_SNAPTORIGHT) fx += (fvw - (FLOATBASEVIDWIDTH * dupx)); else if (!(color & V_SNAPTOLEFT)) - fx += (fvw - (FLOATBASEVIDWIDTH * dupx)) / 2; + fx += (fvw - (FLOATBASEVIDWIDTH * dupx)) / 2.0f; } if (fabsf(fvh - (FLOATBASEVIDHEIGHT * dupy)) > 1.0E-36f) { @@ -848,7 +854,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color) if (color & V_SNAPTOBOTTOM) fy += (fvh - (FLOATBASEVIDHEIGHT * dupy)); else if (!(color & V_SNAPTOTOP)) - fy += (fvh - (FLOATBASEVIDHEIGHT * dupy)) / 2; + fy += (fvh - (FLOATBASEVIDHEIGHT * dupy)) / 2.0f; } } @@ -1122,10 +1128,13 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color) if (alphalevel) { - if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[hudtrans]; - else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[hudtrans]; - else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[hudtrans]; - else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; + switch (alphalevel) + { + case 13: Surf.PolyColor.s.alpha = softwaretranstogl_lo[hudtrans]; break; + case 14: Surf.PolyColor.s.alpha = softwaretranstogl[hudtrans]; break; + case 15: Surf.PolyColor.s.alpha = softwaretranstogl_hi[hudtrans]; break; + default: Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; break; + } } GL_DrawPolygon(&Surf, v, 4, PF_NoTexture|PF_Modulated|PF_Translucent|PF_NoDepthTest); From 37eb8cfa579722548d8243b4e530c9f4d80e297e Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 31 May 2025 19:55:33 +0200 Subject: [PATCH 44/62] 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 45ffe87ba674c01d608dfce84be194cd9b0b4342 Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 31 May 2025 22:27:05 +0300 Subject: [PATCH 45/62] Add new music credit draw style, 'songcredits Box' --- src/g_game.c | 3 ++- src/hu_stuff.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index a872fc571..bc693d97c 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -385,7 +385,8 @@ consvar_t cv_consolechat = {"chatmode", "Window", CV_SAVE, consolechat_cons_t, N consvar_t cv_pauseifunfocused = {"pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; // Display song credits -consvar_t cv_songcredits = {"songcredits", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t songcredits_cons_t[] = {{0, "Off"}, {1, "Default"}, {2, "Box"}, {0, NULL}}; +consvar_t cv_songcredits = {"songcredits", "Default", CV_SAVE, songcredits_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; // Show "FREE PLAY" when you're alone. :( consvar_t cv_showfreeplay = { "showfreeplay", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 2821c4021..0da2d9930 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2133,7 +2133,7 @@ void HU_TickSongCredits(void) } } -void HU_DrawSongCredits(void) +static void HU_DrawSongCreditsVanilla(void) { char *str; INT32 len; @@ -2141,9 +2141,6 @@ void HU_DrawSongCredits(void) INT32 y = (splitscreen ? (BASEVIDHEIGHT/2)-4 : 32); INT32 bgt; - if (!cursongcredit.def) // No def - return; - str = va("\x1F"" %s", cursongcredit.def->source); len = V_ThinStringWidth(str, V_ALLOWLOWERCASE|V_6WIDTHSPACE); destx = (len + 7) * FRACUNIT; @@ -2173,6 +2170,70 @@ void HU_DrawSongCredits(void) V_DrawRightAlignedThinString(cursongcredit.x / FRACUNIT, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_SNAPTOLEFT|(cursongcredit.trans<source; + INT32 strwidth = V_SmallStringWidth(str, V_ALLOWLOWERCASE) + 4; + + // dup dup dup dup + INT32 dup = min(vid.dupx, vid.dupy); + + // Center it + INT32 x = (BASEVIDWIDTH/2 - strwidth/2)*dup + ((vid.width - (BASEVIDWIDTH * vid.dupx)) / 2); + INT32 y = 0; + + INT32 flags = V_SNAPTOTOP|V_NOSCALESTART; + INT32 t = cursongcredit.anim; + INT32 bgt; + + fixed_t interpoffset = FixedMul(BOXCREDITHEIGHT*dup*FRACUNIT/(TICRATE/2), R_GetHudUncap()); + + if (t > BOXCREDITSLIDEIN) + { + // Sliding in + t = TICRATE/2 - (t - BOXCREDITSLIDEIN); + y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup + interpoffset)/FRACUNIT; + } + else if (t < TICRATE/2) + { + // Sliding out + y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup - interpoffset)/FRACUNIT; + } + + bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2); + + if (bgt < NUMTRANSMAPS) + { + V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, 28|flags|(bgt< Date: Sat, 31 May 2025 16:27:34 -0500 Subject: [PATCH 46/62] Options. --- src/d_clisrv.c | 6 ++++-- src/d_clisrv.h | 2 ++ src/d_netcmd.c | 1 + src/m_menu.c | 28 +++++++++++++++------------- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 30a450ee0..4b279c58a 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2572,7 +2572,7 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent) return true; } - cl_mode = CL_VIEWSERVER; + cl_mode = (cv_serverinfoscreen.value) ? CL_VIEWSERVER : CL_CHECKFILES; } else { @@ -2626,7 +2626,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic case CL_ASKFULLFILELIST: if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved - cl_mode = CL_VIEWSERVER; + cl_mode = (cv_serverinfoscreen.value) ? CL_VIEWSERVER : CL_CHECKFILES; else if (fileneedednum != cl_lastcheckedfilecount || I_GetTime() >= *asksent) { if (CL_AskFileList(fileneedednum)) @@ -4228,6 +4228,8 @@ consvar_t cv_downloadspeed = {"downloadspeed", "300", CV_SAVE, downloadspeed_con static CV_PossibleValue_t connectawaittime_cons_t[] = {{1, "MIN"}, {60, "MAX"}, {0, "Inf"}, {0, NULL}}; consvar_t cv_connectawaittime = {"connectawaittime", "5", CV_SAVE, connectawaittime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_serverinfoscreen = {"serverinfoscreen", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + static void Got_AddPlayer(UINT8 **p, INT32 playernum); static void Got_RemovePlayer(UINT8 **p, INT32 playernum); diff --git a/src/d_clisrv.h b/src/d_clisrv.h index 221375c35..35c77ce12 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -611,6 +611,8 @@ extern consvar_t cv_connectawaittime; extern consvar_t cv_discordinvites; +extern consvar_t cv_serverinfoscreen; + // Used in d_net, the only dependence //tic_t ExpandTics(INT32 low, tic_t basetic); void D_ClientServerInit(void); diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 1970b5323..d73d6829a 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -902,6 +902,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_netticbuffer); CV_RegisterVar(&cv_mindelay); CV_RegisterVar(&cv_gentlemens); + CV_RegisterVar(&cv_serverinfoscreen); #ifdef NETGAME_DEVMODE CV_RegisterVar(&cv_fishcake); diff --git a/src/m_menu.c b/src/m_menu.c index 65dab3e6a..b856c3a8a 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2188,29 +2188,30 @@ static menuitem_t OP_SaturnMenu[] = {IT_STRING | IT_CVAR, NULL, "Minimum Input Delay", &cv_mindelay, 20}, {IT_STRING | IT_CVAR, NULL, "Gentlemens Ping", &cv_gentlemens, 25}, + {IT_STRING | IT_CVAR, NULL, "Server Info Screen", &cv_serverinfoscreen, 30}, - {IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 35}, + {IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 40}, - {IT_STRING | IT_CVAR, NULL, "Colorized Speedlines", &cv_coloredspeedlines, 45}, - {IT_STRING | IT_CVAR, NULL, "Colorized Sneakertrails", &cv_coloredsneakertrail, 50}, + {IT_STRING | IT_CVAR, NULL, "Colorized Speedlines", &cv_coloredspeedlines, 50}, + {IT_STRING | IT_CVAR, NULL, "Colorized Sneakertrails", &cv_coloredsneakertrail, 55}, - {IT_STRING | IT_CVAR, NULL, "Player Blendeffects", &cv_playerblendeffects, 60}, + {IT_STRING | IT_CVAR, NULL, "Player Blendeffects", &cv_playerblendeffects, 65}, - {IT_STRING | IT_CVAR, NULL, "Bananadrag Jitter", &cv_bananajitter, 70}, + {IT_STRING | IT_CVAR, NULL, "Bananadrag Jitter", &cv_bananajitter, 75}, - {IT_STRING | IT_CVAR, NULL, "Midair Driftsparks", &cv_airsparks, 80}, + {IT_STRING | IT_CVAR, NULL, "Midair Driftsparks", &cv_airsparks, 85}, - {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 90}, + {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 95}, - {IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 100}, + {IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 105}, - {IT_STRING | IT_CVAR, NULL, "Keyboard Layout", &cv_keyboardlayout, 110}, + {IT_STRING | IT_CVAR, NULL, "Keyboard Layout", &cv_keyboardlayout, 115}, - {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 120}, + {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 125}, - {IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 130}, - {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 135}, - {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 140}, // uwu + {IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 135}, + {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 140}, + {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 145}, // uwu }; static const char* OP_SaturnTooltips[] = @@ -2219,6 +2220,7 @@ static const char* OP_SaturnTooltips[] = "How long can the game wait before it kicks you out from the server\nconnecting screen.", "Practice for online play! 0 = instant response.", "Simulate online input delay when hosting a server.\nValue choosen by Player with the lowest ping", + "Show a screen before joining a server displaying important information about it", "How much speen do you want?", "Colourize the speedlines in your skincolor if you go fast enough!", "Colourize the sneaker flame trails in your skincolor!", From d50c1ab6d78162d130c4f242ae53eb134cd35953 Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 2 Jun 2025 14:21:23 +0300 Subject: [PATCH 47/62] 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 83d20a72ab3772f7a724c3f5b39d0e0eb2320756 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 2 Jun 2025 20:05:09 +0200 Subject: [PATCH 48/62] delet this since its mostly wrong anyways --- src/Makefile | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/Makefile b/src/Makefile index cac95d35b..56edb6db9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -116,8 +116,6 @@ # SDL_CONFIG= - sdl-config command. # SDL_CFLAGS=, SDL_LDFLAGS= -NOBLUAJIT=1 - clean_targets=cleandep clean distclean info .PHONY : $(clean_targets) all @@ -185,13 +183,8 @@ objdir:=$(makedir)/objs sources+=\ $(call List,Sourcefile) -ifdef NOBLUAJIT sources+=\ $(call List,blua/Sourcefile) -else -include bluajit/Makefile.cfg -include bluajit/Makefile.cfg2 -endif depends:=$(basename $(filter %.c %.cpp %.s,$(sources))) objects:=$(basename $(filter %.c %.cpp %.s %.nas,$(sources))) @@ -426,13 +419,6 @@ clean : distclean : $(call _rm,../bin ../objs ../dep ../make comptime.h) -ifndef NOBLUAJIT - $(call _rm,$(objdir)/buildvm* $(objdir)/minilua* $(objdir)/lj_vm*) - -cleanjit: - $(call _rm,$(objdir)/buildvm* $(objdir)/minilua* $(objdir)/lj_vm* $(ALL_HDRGEN) $(LJVMCORE_O) $(ALL_GEN)) -endif - info: ifdef WINDOWSHELL @REM From fc51c1ba886653be0d783dbd726d9f323de8c041 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 49/62] 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 03f81bed16cd7e946f5c5e79f0c816a2534f18c5 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 3 Jun 2025 19:46:22 +0200 Subject: [PATCH 50/62] dont initialise those twice lol --- src/r_draw8.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/r_draw8.c b/src/r_draw8.c index f9e3e12e7..6edc9d6a6 100644 --- a/src/r_draw8.c +++ b/src/r_draw8.c @@ -782,10 +782,6 @@ void R_DrawSpan_8 (void) xposition <<= nflatshiftup; yposition <<= nflatshiftup; xstep <<= nflatshiftup; ystep <<= nflatshiftup; - source = ds_source; - colormap = ds_colormap; - dest = ylookup[ds_y] + columnofs[ds_x1]; - if (dest+8 > deststop) { return; From dcccf672c958e86960ce573268d8518451d9694b 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 51/62] 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 b856c3a8a..18dd43687 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3602,8 +3602,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 236e7b8d45b07eeec9dc94b54eb0a7bf2bf95fd8 Mon Sep 17 00:00:00 2001 From: Indev Date: Wed, 4 Jun 2025 03:57:47 +0300 Subject: [PATCH 52/62] Fix game rendering only first splitscreen player in opengl --- src/d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_main.c b/src/d_main.c index d10ba05ab..a47c8b756 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -345,7 +345,7 @@ static void D_Renderview(void) { HWR_RenderPlayerView(); R_RestoreLevelInterpolators(); - return; + continue; } #endif if (issplitscreen) // Splitscreen-specific From 0a31e0a65e2ec99f9a2689755ea54ef32dd319a0 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 7 Jun 2025 02:35:49 +0200 Subject: [PATCH 53/62] use realloc for batching stuff seems to strangely speed things up even didnt think those happen often? --- src/hardware/hw_batching.c | 40 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c index b8490f4ed..801442b6f 100644 --- a/src/hardware/hw_batching.c +++ b/src/hardware/hw_batching.c @@ -89,32 +89,23 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt { if (!pSurf) { - I_Error("Got a null FSurfaceInfo in batching");// nulls should not come in the stuff that batching currently applies to + I_Error("Got a null FSurfaceInfo in batching"); // nulls should not come in the stuff that batching currently applies to } if (polygonArraySize == polygonArrayAllocSize) { - PolygonArrayEntry* new_array; - // ran out of space, make new array double the size + // ran out of space, double the array size polygonArrayAllocSize *= 2; - new_array = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry)); - memcpy(new_array, polygonArray, polygonArraySize * sizeof(PolygonArrayEntry)); - free(polygonArray); - polygonArray = new_array; + polygonArray = realloc(polygonArray, polygonArrayAllocSize * sizeof(PolygonArrayEntry)); // also need to redo the index array, dont need to copy it though - free(polygonArraySorted); - polygonArraySorted = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry *)); + polygonArraySorted = realloc(polygonArraySorted, polygonArrayAllocSize * sizeof(PolygonArrayEntry*)); } while (unsortedVertexArraySize + (int)iNumPts > unsortedVertexArrayAllocSize) { - FOutVector* new_array; // need more space for vertices in unsortedVertexArray unsortedVertexArrayAllocSize *= 2; - new_array = malloc(unsortedVertexArrayAllocSize * sizeof(FOutVector)); - memcpy(new_array, unsortedVertexArray, unsortedVertexArraySize * sizeof(FOutVector)); - free(unsortedVertexArray); - unsortedVertexArray = new_array; + unsortedVertexArray = realloc(unsortedVertexArray, unsortedVertexArrayAllocSize * sizeof(FOutVector)); } // add the polygon data to the arrays @@ -138,10 +129,11 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt } } + static int comparePolygons(const void *p1, const void *p2) { - PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1; - PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2; + const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1; + const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2; int diff; INT64 diff64; @@ -177,9 +169,7 @@ static int comparePolygons(const void *p1, const void *p2) diff = poly1->surf.LightInfo.fade_end - poly2->surf.LightInfo.fade_end; if (diff != 0) return diff; - diff = poly1->surf.LightInfo.directional - poly2->surf.LightInfo.directional; - - return diff; + return poly1->surf.LightInfo.directional - poly2->surf.LightInfo.directional; } static int comparePolygonsNoShaders(const void *p1, const void *p2) @@ -328,19 +318,11 @@ void HWR_RenderBatches(void) // probably never will this loop run more than once though while (finalVertexWritePos + numVerts > finalVertexArrayAllocSize) { - FOutVector* new_array; - unsigned int* new_index_array; finalVertexArrayAllocSize *= 2; - new_array = malloc(finalVertexArrayAllocSize * sizeof(FOutVector)); - memcpy(new_array, finalVertexArray, finalVertexWritePos * sizeof(FOutVector)); - free(finalVertexArray); - finalVertexArray = new_array; + finalVertexArray = realloc(finalVertexArray, finalVertexArrayAllocSize * sizeof(FOutVector)); // also increase size of index array, 3x of vertex array since // going from fans to triangles increases vertex count to 3x - new_index_array = malloc(finalVertexArrayAllocSize * 3 * sizeof(UINT32)); - memcpy(new_index_array, finalVertexIndexArray, finalIndexWritePos * sizeof(UINT32)); - free(finalVertexIndexArray); - finalVertexIndexArray = new_index_array; + finalVertexIndexArray = realloc(finalVertexIndexArray, finalVertexArrayAllocSize * 3 * sizeof(UINT32)); } // write the vertices of the polygon memcpy(&finalVertexArray[finalVertexWritePos], &unsortedVertexArray[entry->vertsIndex], From 8dd6d7cfdd2dd7ccaba18a2382a0da9b36adc3e3 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 9 Jun 2025 16:58:39 +0200 Subject: [PATCH 54/62] 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 15f17db9d..490d6eda4 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1350,10 +1350,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 19c98a436aa12de68618e9d97caa4770540a5ad6 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 9 Jun 2025 17:04:13 +0200 Subject: [PATCH 55/62] fix some fofs not rendering in software i did an oopsie in 7.2 X) --- src/r_plane.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/r_plane.c b/src/r_plane.c index 03dea56be..37930e89e 100644 --- a/src/r_plane.c +++ b/src/r_plane.c @@ -826,15 +826,18 @@ void R_DrawSinglePlane(visplane_t *pl) // Don't draw planes that shouldn't be drawn. for (rover = pl->ffloor->target->ffloors; rover; rover = rover->next) { - if (!((pl->ffloor->flags & FF_CUTEXTRA) && (rover->flags & FF_EXTRA))) - continue; + if ((pl->ffloor->flags & FF_CUTEXTRA) && (rover->flags & FF_EXTRA)) + { + if (!(rover->flags & FF_EXTRA)) + continue; - // The plane is from an extra 3D floor... Check the flags so - // there are no undesired cuts. - if (((pl->ffloor->flags & (FF_FOG|FF_SWIMMABLE)) == (rover->flags & (FF_FOG|FF_SWIMMABLE))) - && pl->height < *rover->topheight - && pl->height > *rover->bottomheight) - return; + // The plane is from an extra 3D floor... Check the flags so + // there are no undesired cuts. + if (((pl->ffloor->flags & (FF_FOG|FF_SWIMMABLE)) == (rover->flags & (FF_FOG|FF_SWIMMABLE))) + && pl->height < *rover->topheight + && pl->height > *rover->bottomheight) + return; + } } if (pl->ffloor->flags & FF_TRANSLUCENT) From 0a3e7ba09f499d73f763942930664b932eae8bb3 Mon Sep 17 00:00:00 2001 From: Eidolon Date: Sat, 24 Feb 2024 13:21:55 -0600 Subject: [PATCH 56/62] Include poll.h on UNIXCOMMON Apple was not including poll.h despite needing it. --- src/sdl/i_system.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index b0890913a..f1f34cf07 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -110,8 +110,11 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #endif #endif -#if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__)) +#if defined(UNIXCOMMON) #include +#endif + +#if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__)) #include #include #define NEWSIGNALHANDLER From a9209a4887159746e32189ba4cbb50eabee623b4 Mon Sep 17 00:00:00 2001 From: PAS Date: Tue, 10 Jun 2025 21:49:26 -0400 Subject: [PATCH 57/62] Include errno.h on macOS --- src/sdl/i_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c index d6a007919..b4f502e99 100644 --- a/src/sdl/i_main.c +++ b/src/sdl/i_main.c @@ -27,7 +27,7 @@ #include #endif -#ifdef __unix__ +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) #include #endif From 618d9e4cdf5394f31e35149458208af95f95fe6a Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 11 Jun 2025 20:54:57 +0200 Subject: [PATCH 58/62] add lugent to credits --- src/f_finale.c | 5 +++-- src/m_menu.c | 55 +++++++++++++++++++++++++------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index dd024ecd0..b98570b48 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -531,8 +531,8 @@ static const char *credits[] = { "\"Xyzzy\"", "\"Chearii\"", " ", - "\"Sunflower\" aka \"AnimeSonic\"", - "\"Yuz\" aka \"Yuzler\"", + "\"Sunflower\"", + "\"Yuz\"", "\"Democrab\"", "\"EXpand\"", "\"Nexit\"", @@ -543,6 +543,7 @@ static const char *credits[] = { "\"Achii\"", "\"Anonimus\"", "\"scizor300\"", + "\"Lugent\"", "", "\1Special Thanks", "SEGA", diff --git a/src/m_menu.c b/src/m_menu.c index 18dd43687..3f84da6b6 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2468,39 +2468,38 @@ static menuitem_t OP_HudOffsetMenu[] = 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, "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_STRING2+IT_SPACE, NULL, "Sunflower", NULL, 80}, + {IT_STRING2+IT_SPACE, NULL, "Yuz", NULL, 90}, + {IT_STRING2+IT_SPACE, NULL, "Democrab", NULL, 100}, + {IT_STRING2+IT_SPACE, NULL, "EXpand", NULL, 110}, + {IT_STRING2+IT_SPACE, NULL, "Nexit", NULL, 120}, + {IT_STRING2+IT_SPACE, NULL, "Spee", NULL, 130}, + {IT_STRING2+IT_SPACE, NULL, "jin", NULL, 140}, + {IT_STRING2+IT_SPACE, NULL, "riomccloud", NULL, 150}, + {IT_STRING2+IT_SPACE, NULL, "chromaticpipe", NULL, 160}, + {IT_STRING2+IT_SPACE, NULL, "Achii", NULL, 170}, + {IT_STRING2+IT_SPACE, NULL, "Anonimus", NULL, 180}, + {IT_STRING2+IT_SPACE, NULL, "scizor300", NULL, 190}, + {IT_STRING2+IT_SPACE, NULL, "Lugent", NULL, 200}, - {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_HEADER, NULL, "Special Thanks <3", NULL, 168}, - {IT_HEADER, NULL, "Special Thanks <3", NULL, 167}, + {IT_STRING2+IT_SPACE, NULL, "All of Sunflower's Garden", NULL, 178}, + {IT_STRING2+IT_SPACE, NULL, "The Moe Mansion and Birdhouse Team", NULL, 188}, + {IT_STRING2+IT_SPACE, NULL, "Galactice for Galaxy", NULL, 198}, - {IT_STRING2+IT_SPACE, NULL, "All of Sunflower's Garden", NULL, 177}, - {IT_STRING2+IT_SPACE, NULL, "The Moe Mansion and Birdhouse Team", NULL, 187}, - {IT_STRING2+IT_SPACE, NULL, "Galactice for Galaxy", NULL, 197}, - - {IT_STRING+IT_SPACE, NULL, "", NULL, 207}, // dummy text I - {IT_STRING, NULL, "", NULL, 267}, // dummy text II + {IT_STRING+IT_SPACE, NULL, "", NULL, 198}, // dummy text I + {IT_STRING, NULL, "", NULL, 258}, // dummy text II }; // sry we dont have space for this anymore :/ From 3d22a5906fbe06f7eb7a398874e001c0b0140530 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 59/62] 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 be3e5a964d4fe198be2f5040ced511626ac74539 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 12 Jun 2025 23:33:22 +0200 Subject: [PATCH 60/62] pass -flto to linkerflags too lel forgor somehow this still worked anyways --- src/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile b/src/Makefile index 56edb6db9..9acfd6d3c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -246,6 +246,7 @@ opts+=-O3 ifdef USELTO # compile with LTO opts+=-flto=auto +libs+=-flto=auto endif endif From b6da6359d3a418f2259f5057e8d019cf71cf3917 Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 16 Jun 2025 21:43:54 +0300 Subject: [PATCH 61/62] 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 bb5be9a6c..da864f151 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -98,7 +98,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? @@ -4332,7 +4332,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 @@ -5043,7 +5043,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 @@ -5494,7 +5494,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 @@ -5504,7 +5504,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)) { @@ -5834,7 +5834,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: @@ -6465,10 +6465,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 70a70084c9008a64a33a5f762e60834d7a032b33 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 17 Jun 2025 19:21:09 +0200 Subject: [PATCH 62/62] macrofy ogl function pointer setup should make it a little less annoying to add new functions --- src/hardware/r_opengl/r_opengl.c | 316 +++++++++++++++++-------------- 1 file changed, 177 insertions(+), 139 deletions(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 07ceaf86f..3988f11b4 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -737,69 +737,78 @@ static boolean GLFramebuffer_CheckExt(void) return false; // check if all needed gl extensions are available - return (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) && GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) && GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions)); + return (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) + && GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) + && GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions)); } #endif void SetupGLFunc4(void) { +#define GetGLfunc(func) \ + p##func = GetGLFunc(#func); \ + if (!p##func) \ + { \ + GL_MSG_Warning("failed to get OpenGL function: %s", #func); \ + } \ + /* 1.2 funcs */ - pglTexImage3D = GetGLFunc("glTexImage3D"); + GetGLfunc(glTexImage3D); /* 1.3 funcs */ - pglActiveTexture = GetGLFunc("glActiveTexture"); - pglMultiTexCoord2f = GetGLFunc("glMultiTexCoord2f"); - pglClientActiveTexture = GetGLFunc("glClientActiveTexture"); - pglMultiTexCoord2fv = GetGLFunc("glMultiTexCoord2fv"); + GetGLfunc(glActiveTexture); + GetGLfunc(glMultiTexCoord2f); + GetGLfunc(glClientActiveTexture); + GetGLfunc(glMultiTexCoord2fv); /* 1.5 funcs */ - pglGenBuffers = GetGLFunc("glGenBuffers"); - pglBindBuffer = GetGLFunc("glBindBuffer"); - pglBufferData = GetGLFunc("glBufferData"); - pglDeleteBuffers = GetGLFunc("glDeleteBuffers"); - pglColorPointer = GetGLFunc("glColorPointer"); + GetGLfunc(glGenBuffers); + GetGLfunc(glBindBuffer); + GetGLfunc(glBufferData); + GetGLfunc(glDeleteBuffers); + GetGLfunc(glColorPointer); /* 2.0 funcs */ - pglBlendEquation = GetGLFunc("glBlendEquation"); + GetGLfunc(glBlendEquation); - pglStencilFuncSeparate = GetGLFunc("glStencilFuncSeparate"); - pglStencilOpSeparate = GetGLFunc("glStencilOpSeparate"); + GetGLfunc(glStencilFuncSeparate); + GetGLfunc(glStencilOpSeparate); - pglCreateShader = GetGLFunc("glCreateShader"); - pglShaderSource = GetGLFunc("glShaderSource"); - pglCompileShader = GetGLFunc("glCompileShader"); - pglGetShaderiv = GetGLFunc("glGetShaderiv"); - pglGetShaderInfoLog = GetGLFunc("glGetShaderInfoLog"); - pglDeleteShader = GetGLFunc("glDeleteShader"); - pglCreateProgram = GetGLFunc("glCreateProgram"); - pglDeleteProgram = GetGLFunc("glDeleteProgram"); - pglAttachShader = GetGLFunc("glAttachShader"); - pglLinkProgram = GetGLFunc("glLinkProgram"); - pglGetProgramiv = GetGLFunc("glGetProgramiv"); - pglGetProgramInfoLog = GetGLFunc("glGetProgramInfoLog"); - pglUseProgram = GetGLFunc("glUseProgram"); - pglUniform1i = GetGLFunc("glUniform1i"); - pglUniform1f = GetGLFunc("glUniform1f"); - pglUniform2f = GetGLFunc("glUniform2f"); - pglUniform3f = GetGLFunc("glUniform3f"); - pglUniform4f = GetGLFunc("glUniform4f"); - pglUniform1fv = GetGLFunc("glUniform1fv"); - pglUniform2fv = GetGLFunc("glUniform2fv"); - pglUniform3fv = GetGLFunc("glUniform3fv"); - pglGetUniformLocation = GetGLFunc("glGetUniformLocation"); + GetGLfunc(glCreateShader); + GetGLfunc(glShaderSource); + GetGLfunc(glCompileShader); + GetGLfunc(glGetShaderiv); + GetGLfunc(glGetShaderInfoLog); + GetGLfunc(glDeleteShader); + GetGLfunc(glCreateProgram); + GetGLfunc(glDeleteProgram); + GetGLfunc(glAttachShader); + GetGLfunc(glLinkProgram); + GetGLfunc(glGetProgramiv); + GetGLfunc(glGetProgramInfoLog); + GetGLfunc(glUseProgram); + GetGLfunc(glUniform1i); + GetGLfunc(glUniform1f); + GetGLfunc(glUniform2f); + GetGLfunc(glUniform3f); + GetGLfunc(glUniform4f); + GetGLfunc(glUniform1fv); + GetGLfunc(glUniform2fv); + GetGLfunc(glUniform3fv); + GetGLfunc(glGetUniformLocation); #ifdef USE_FBO_OGL if (GLFramebuffer_CheckExt()) { - pglGenFramebuffers = GetGLFunc("glGenFramebuffers"); - pglBindFramebuffer = GetGLFunc("glBindFramebuffer"); - pglDeleteFramebuffers = GetGLFunc("glDeleteFramebuffers"); - pglFramebufferTexture2D = GetGLFunc("glFramebufferTexture2D"); - pglCheckFramebufferStatus = GetGLFunc("glCheckFramebufferStatus"); - pglGenRenderbuffers = GetGLFunc("glGenRenderbuffers"); - pglBindRenderbuffer = GetGLFunc("glBindRenderbuffer"); - pglDeleteRenderbuffers = GetGLFunc("glDeleteRenderbuffers"); - pglRenderbufferStorage = GetGLFunc("glRenderbufferStorage"); - pglFramebufferRenderbuffer = GetGLFunc("glFramebufferRenderbuffer"); + GetGLfunc(glGenFramebuffers); + GetGLfunc(glBindFramebuffer); + GetGLfunc(glDeleteFramebuffers); + GetGLfunc(glFramebufferTexture2D); + GetGLfunc(glCheckFramebufferStatus); + GetGLfunc(glGenRenderbuffers); + GetGLfunc(glBindRenderbuffer); + GetGLfunc(glDeleteRenderbuffers); + GetGLfunc(glRenderbufferStorage); + GetGLfunc(glFramebufferRenderbuffer); // check if ALL functions are availible if (pglGenFramebuffers && pglBindFramebuffer && @@ -810,6 +819,7 @@ void SetupGLFunc4(void) supportFBO = true; } #endif +#undef GetGLfunc } boolean GL_InitShaders(void) @@ -959,6 +969,7 @@ static void GL_SetNoTexture(void) { if (NOTEXTURE_NUM == 0) pglGenTextures(1, &NOTEXTURE_NUM); + pglBindTexture(GL_TEXTURE_2D, NOTEXTURE_NUM); tex_downloaded = NOTEXTURE_NUM; } @@ -1108,10 +1119,12 @@ void GL_DeleteTexture(GLMipmap_t *pTexInfo) head->next->prev = head->prev; else // no next -> tail is being deleted -> update TexCacheTail TexCacheTail = head->prev; + if (head->prev) head->prev->next = head->next; else // no prev -> head is being deleted -> update TexCacheHead TexCacheHead = head->next; + free(head); break; } @@ -1132,7 +1145,7 @@ static void GL_Framebuffer_GenerateAttachments(void) pglBindFramebuffer(GL_FRAMEBUFFER, FramebufferObject); // Generate the framebuffer texture - if (FramebufferTexture == 0) + if (!FramebufferTexture) { pglGenTextures(1, &FramebufferTexture); pglBindTexture(GL_TEXTURE_2D, FramebufferTexture); @@ -1146,7 +1159,7 @@ static void GL_Framebuffer_GenerateAttachments(void) } // Generate the renderbuffer - if (RenderbufferObject == 0) + if (!RenderbufferObject) { pglGenRenderbuffers(1, &RenderbufferObject); @@ -1168,10 +1181,10 @@ static void GL_Framebuffer_GenerateAttachments(void) static void GL_Framebuffer_DeleteAttachments(void) { - if (!supportFBO || fboinit == false) + if (!supportFBO || !fboinit) return; - if (FramebufferObject == 0 && RenderbufferObject == 0 && FramebufferTexture == 0) + if (!FramebufferObject && !RenderbufferObject && !FramebufferTexture) return; // Unbind the framebuffer @@ -1195,7 +1208,7 @@ static void GL_Framebuffer_Generate(void) return; // Generate the framebuffer - if (FramebufferObject == 0) + if (!FramebufferObject) pglGenFramebuffers(1, &FramebufferObject); if (pglCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE) @@ -1204,7 +1217,7 @@ static void GL_Framebuffer_Generate(void) static void GL_Framebuffer_Delete(void) { - if (!supportFBO || fboinit == false) + if (!supportFBO || !fboinit) return; if (FramebufferObject) @@ -1216,10 +1229,10 @@ static void GL_Framebuffer_Delete(void) void GL_Framebuffer_Unbind(void) { - if (!supportFBO || fboinit == false) + if (!supportFBO || !fboinit) return; - if (FramebufferObject == 0 && RenderbufferObject == 0) + if (!FramebufferObject && !RenderbufferObject) return; pglBindFramebuffer(GL_FRAMEBUFFER, 0); @@ -1233,7 +1246,7 @@ void GL_Framebuffer_Enable(void) if (FramebufferObject == 0) GL_Framebuffer_Generate(); - else if (FramebufferTexture == 0 || RenderbufferObject == 0) + else if (!FramebufferTexture || !RenderbufferObject) GL_Framebuffer_GenerateAttachments(); pglBindFramebuffer(GL_FRAMEBUFFER, FramebufferObject); @@ -1242,10 +1255,10 @@ void GL_Framebuffer_Enable(void) void GL_Framebuffer_Disable(void) { - if (!supportFBO || fboinit == false) + if (!supportFBO || !fboinit) return; - if (FramebufferObject == 0 && RenderbufferObject == 0) + if (!FramebufferObject && !RenderbufferObject) return; pglBindFramebuffer(GL_FRAMEBUFFER, 0); @@ -1295,20 +1308,29 @@ INT32 GL_isExtAvailable(const char *extension, const GLubyte *start) { GLubyte *where, *terminator; - if (!extension || !start) return 0; + if (!extension || !start) + return 0; + where = (GLubyte *) strchr(extension, ' '); + if (where || *extension == '\0') return 0; for (;;) { where = (GLubyte *) strstr((const char *) start, extension); + if (!where) break; + terminator = where + strlen(extension); + if (where == start || *(where - 1) == ' ') + { if (*terminator == ' ' || *terminator == '\0') return 1; + } + start = terminator; } return 0; @@ -1340,23 +1362,33 @@ void GL_ReadScreenTexture(int tex, UINT16 *dst_data) { INT32 i; int dst_stride = screen_width * 3; // stride between rows of image data - GLubyte*top = (GLvoid*)dst_data, *bottom = top + dst_stride * (screen_height - 1); + GLubyte *top, *bottom; GLubyte *row; + row = malloc(dst_stride); - if (!row) return; + + if (!row) + return; + + top = (GLvoid*)dst_data; + bottom = top + dst_stride * (screen_height - 1); + // at the time this function is called, generic2 can be found drawn on the framebuffer // if some other screen texture is needed, draw it to the framebuffer // and draw generic2 back after reading the framebuffer. // this hack is for some reason **much** faster than the simple solution of using glGetTexImage. if (tex != HWD_SCREENTEXTURE_GENERIC2) GL_DrawScreenTexture(tex, NULL, 0); + pglPixelStorei(GL_PACK_ALIGNMENT, 1); pglReadPixels(0, 0, screen_width, screen_height, GL_RGB, GL_UNSIGNED_BYTE, dst_data); + if (tex != HWD_SCREENTEXTURE_GENERIC2) GL_DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2, NULL, 0); + // Flip image upside down. // In other words, convert OpenGL's "bottom->top" row order into "top->bottom". - for(i = 0; i < screen_height/2; i++) + for (i = 0; i < screen_height/2; i++) { memcpy(row, top, dst_stride); memcpy(top, bottom, dst_stride); @@ -1364,6 +1396,7 @@ void GL_ReadScreenTexture(int tex, UINT16 *dst_data) top += dst_stride; bottom -= dst_stride; } + free(row); } @@ -1416,10 +1449,8 @@ void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask if (ColorMask) { if (ClearColor) - pglClearColor(ClearColor->red, - ClearColor->green, - ClearColor->blue, - ClearColor->alpha); + pglClearColor(ClearColor->red, ClearColor->green, ClearColor->blue, ClearColor->alpha); + ClearMask |= GL_COLOR_BUFFER_BIT; } if (DepthMask) @@ -1434,6 +1465,7 @@ void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask if (StencilMask) ClearMask |= GL_STENCIL_BUFFER_BIT;// looks like sometimes stencil buffer needs clearing? had a problem with random black screens + pglClear(ClearMask); pglEnableClientState(GL_VERTEX_ARRAY); // We always use this one pglEnableClientState(GL_TEXTURE_COORD_ARRAY); // And mostly this one, too @@ -2058,7 +2090,7 @@ static boolean GL_Shader_CompileProgram(gl_shader_t *shader, GLint i) pglGetShaderiv(gl_fragShader, GL_COMPILE_STATUS, &result); if (result == GL_FALSE) { - pglGetShaderInfoLog(gl_fragShader, 512, NULL, info_log); + pglGetShaderInfoLog(gl_fragShader, 512, NULL, info_log); GL_MSG_Error("Error compiling fragment shader: %s\n", info_log); pglDeleteShader(gl_vertShader); @@ -2096,25 +2128,25 @@ static boolean GL_Shader_CompileProgram(gl_shader_t *shader, GLint i) #define GETUNI(uniform) pglGetUniformLocation(shader->program, uniform); // lighting - shader->uniforms[gluniform_poly_color] = GETUNI("poly_color"); - shader->uniforms[gluniform_tint_color] = GETUNI("tint_color"); - shader->uniforms[gluniform_fade_color] = GETUNI("fade_color"); - shader->uniforms[gluniform_lighting] = GETUNI("lighting"); - shader->uniforms[gluniform_fade_start] = GETUNI("fade_start"); - shader->uniforms[gluniform_fade_end] = GETUNI("fade_end"); - shader->uniforms[gluniform_light_dir] = GETUNI("light_dir"); - shader->uniforms[gluniform_light_contrast] = GETUNI("light_contrast"); - shader->uniforms[gluniform_light_backlight] = GETUNI("light_backlight"); + shader->uniforms[gluniform_poly_color] = GETUNI("poly_color"); + shader->uniforms[gluniform_tint_color] = GETUNI("tint_color"); + shader->uniforms[gluniform_fade_color] = GETUNI("fade_color"); + shader->uniforms[gluniform_lighting] = GETUNI("lighting"); + shader->uniforms[gluniform_fade_start] = GETUNI("fade_start"); + shader->uniforms[gluniform_fade_end] = GETUNI("fade_end"); + shader->uniforms[gluniform_light_dir] = GETUNI("light_dir"); + shader->uniforms[gluniform_light_contrast] = GETUNI("light_contrast"); + shader->uniforms[gluniform_light_backlight] = GETUNI("light_backlight"); // palette rendering - shader->uniforms[gluniform_palette_tex] = GETUNI("palette_tex"); - shader->uniforms[gluniform_palette_lookup_tex] = GETUNI("palette_lookup_tex"); - shader->uniforms[gluniform_lighttable_tex] = GETUNI("lighttable_tex"); + shader->uniforms[gluniform_palette_tex] = GETUNI("palette_tex"); + shader->uniforms[gluniform_palette_lookup_tex] = GETUNI("palette_lookup_tex"); + shader->uniforms[gluniform_lighttable_tex] = GETUNI("lighttable_tex"); - shader->uniforms[gluniform_scr_resolution] = GETUNI("scr_resolution"); + shader->uniforms[gluniform_scr_resolution] = GETUNI("scr_resolution"); // misc. - shader->uniforms[gluniform_leveltime] = GETUNI("leveltime"); + shader->uniforms[gluniform_leveltime] = GETUNI("leveltime"); #undef GETUNI // set permanent uniform values @@ -2322,49 +2354,50 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value) gl_allowshaders = Value; break; case HWD_SET_TEXTUREFILTERMODE: - - switch (Value) { - case HWD_SET_TEXTUREFILTER_TRILINEAR: - min_filter = GL_LINEAR_MIPMAP_LINEAR; - mag_filter = GL_LINEAR; - MipMap = GL_TRUE; - break; - case HWD_SET_TEXTUREFILTER_BILINEAR: - min_filter = mag_filter = GL_LINEAR; + switch (Value) + { + case HWD_SET_TEXTUREFILTER_TRILINEAR: + min_filter = GL_LINEAR_MIPMAP_LINEAR; + mag_filter = GL_LINEAR; + MipMap = GL_TRUE; + break; + case HWD_SET_TEXTUREFILTER_BILINEAR: + min_filter = mag_filter = GL_LINEAR; + MipMap = GL_FALSE; + break; + case HWD_SET_TEXTUREFILTER_POINTSAMPLED: + min_filter = mag_filter = GL_NEAREST; + MipMap = GL_FALSE; + break; + case HWD_SET_TEXTUREFILTER_MIXED1: + min_filter = GL_NEAREST; + mag_filter = GL_LINEAR; + MipMap = GL_FALSE; + break; + case HWD_SET_TEXTUREFILTER_MIXED2: + min_filter = GL_LINEAR; + mag_filter = GL_NEAREST; + MipMap = GL_FALSE; + break; + case HWD_SET_TEXTUREFILTER_MIXED3: + min_filter = GL_LINEAR_MIPMAP_LINEAR; + mag_filter = GL_NEAREST; + MipMap = GL_TRUE; + break; + default: + min_filter = GL_NEAREST; + mag_filter = GL_LINEAR; + } + + if (!supportMipMap) + { MipMap = GL_FALSE; - break; - case HWD_SET_TEXTUREFILTER_POINTSAMPLED: - min_filter = mag_filter = GL_NEAREST; - MipMap = GL_FALSE; - break; - case HWD_SET_TEXTUREFILTER_MIXED1: - min_filter = GL_NEAREST; - mag_filter = GL_LINEAR; - MipMap = GL_FALSE; - break; - case HWD_SET_TEXTUREFILTER_MIXED2: min_filter = GL_LINEAR; - mag_filter = GL_NEAREST; - MipMap = GL_FALSE; - break; - case HWD_SET_TEXTUREFILTER_MIXED3: - min_filter = GL_LINEAR_MIPMAP_LINEAR; - mag_filter = GL_NEAREST; - MipMap = GL_TRUE; - break; - default: - min_filter = GL_NEAREST; - mag_filter = GL_LINEAR; - } + } - if (!supportMipMap) - { - MipMap = GL_FALSE; - min_filter = GL_LINEAR; + GL_Flush(); //??? if we want to change filter mode by texture, remove this } - - GL_Flush(); //??? if we want to change filter mode by texture, remove this break; case HWD_SET_WIREFRAME: @@ -2706,7 +2739,7 @@ void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics pglColor4ubv((GLubyte*)&Surface->PolyColor.s); - GL_SetBlend((poly.alpha < 1 ? Surface->PolyFlags : (PF_Masked|PF_Occlude))|PF_Modulated); + GL_SetBlend(((poly.alpha < 1) ? Surface->PolyFlags : (PF_Masked|PF_Occlude))|PF_Modulated); tint.red = byte2float[Surface->TintColor.s.red]; tint.green = byte2float[Surface->TintColor.s.green]; @@ -2750,9 +2783,9 @@ void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics if (hflipped) scalez = -scalez; - pglRotatef(pos->anglez, 0.0f, 0.0f, -1.0f); - pglRotatef(pos->anglex, 1.0f, 0.0f, 0.0f); - pglRotatef(pos->angley, 0.0f, -1.0f, 0.0f); + pglRotatef(pos->anglez, 0.0f, 0.0f, -1.0f); + pglRotatef(pos->anglex, 1.0f, 0.0f, 0.0f); + pglRotatef(pos->angley, 0.0f, -1.0f, 0.0f); if (pos->roll) { @@ -2923,8 +2956,10 @@ void GL_SetTransform(FTransform *stransform) if (shearing) { float dy = stransform->viewaiming * 2; + if (stransform->fliptype == TRANSFORM_FLIP || stransform->fliptype == TRANSFORM_MIRRORFLIP) dy *= -1.0f; + pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f); } @@ -2976,9 +3011,9 @@ void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]) const float blackBack[16] = { -16.0f, -16.0f, 6.0f, - -16.0f, 16.0f, 6.0f, - 16.0f, 16.0f, 6.0f, - 16.0f, -16.0f, 6.0f + -16.0f, 16.0f, 6.0f, + 16.0f, 16.0f, 6.0f, + 16.0f, -16.0f, 6.0f }; if (gl_enable_screen_textures != 2) @@ -3000,9 +3035,9 @@ void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]) pglDrawArrays(GL_TRIANGLE_FAN, 0, 4); pglEnableClientState(GL_TEXTURE_COORD_ARRAY); - for(x = 0; x < SCREENVERTS-1;x ++) + for (x = 0; x < (SCREENVERTS-1); x ++) { - for(y = 0; y < SCREENVERTS-1; y++) + for (y = 0; y < (SCREENVERTS-1); y++) { float stCoords[8]; float vertCoords[12]; @@ -3054,23 +3089,22 @@ void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]) void GL_FlushScreenTextures(void) { pglDeleteTextures(NUMSCREENTEXTURES, screenTextures); - memset(screenTextures, 0 , sizeof(screenTextures)); + memset(screenTextures, 0, sizeof(screenTextures)); } void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags) { + float fix[8]; float xfix, yfix; const float screenVerts[12] = { -1.0f, -1.0f, 1.0f, - -1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, - 1.0f, -1.0f, 1.0f + -1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, + 1.0f, -1.0f, 1.0f }; - float fix[8]; - if (gl_enable_screen_textures != 2) return; @@ -3115,9 +3149,9 @@ void GL_DoScreenWipe(int wipeStart, int wipeEnd) const float screenVerts[12] = { -1.0f, -1.0f, 1.0f, - -1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, - 1.0f, -1.0f, 1.0f + -1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, + 1.0f, -1.0f, 1.0f }; float fix[8]; @@ -3201,9 +3235,9 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 float screenVerts[12] = { -1.0f, -1.0f, 1.0f, - -1.0f, 1.0f, 1.0f, - 1.0f, 1.0f, 1.0f, - 1.0f, -1.0f, 1.0f + -1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, + 1.0f, -1.0f, 1.0f }; if (gl_enable_screen_textures != 2) @@ -3302,6 +3336,7 @@ void GL_MakeScreenTexture(int tex) // Create screen texture if (firstTime) pglGenTextures(1, &screenTextures[tex]); + pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]); if (firstTime) @@ -3336,6 +3371,7 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh origaspect = (float)screen_width / screen_height; newaspect = (float)width / height; + if (origaspect < newaspect) { xoff = origaspect / newaspect; @@ -3471,8 +3507,10 @@ void GL_SetScreenPalette(RGBA_t *palette) if (memcmp(screenPalette, palette, sizeof(screenPalette))) { memcpy(screenPalette, palette, sizeof(screenPalette)); + if (!screenPaletteTex) pglGenTextures(1, &screenPaletteTex); + pglActiveTexture(GL_TEXTURE2); pglBindTexture(GL_TEXTURE_1D, screenPaletteTex); pglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);