thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-23 16:32:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into better-voltage-release

Browse source
This commit is contained in:
AJ Martinez 2024-05-04 17:14:28 -07:00
commit 03037a2f13
49 changed files with 298 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
.gitlab-ci.yml
View file

@ -202,7 +202,7 @@ Debian testing GCC:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.camke -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -218,17 +218,19 @@ Debian testing GCC:
Windows x86: Windows x86:
stage: build stage: build
when: manual when: on_success
artifacts: artifacts:
paths: paths:
- "build.cmake/bin/" - "build/ninja-x86_mingw_static_vcpkg-debug/bin/"
- "build.cmake/src/config.h" - "build/ninja-x86_mingw_static_vcpkg-debug/src/config.h"
expose_as: "Win32" expose_as: "Win32"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
variables: variables:
PREFIX: i686-w64-mingw32 PREFIX: i686-w64-mingw32
CC: /usr/bin/i686-w64-mingw32-gcc-posix
CXX: /usr/bin/i686-w64-mingw32-g++-posix
script: script:
- - | - - |
@ -239,10 +241,19 @@ Windows x86:
# apt_toolchain # apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install ninja-build
- |
# apt_development
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake --preset ninja-x86_mingw_static_vcpkg-debug -DVCPKG_TARGET_TRIPLET=x86-mingw-static -DCMAKE_C_COMPILER=/usr/bin/i686-w64-mingw32-gcc-posix -DCMAKE_CXX_COMPILER=/usr/bin/i686-w64-mingw32-g++-posix -G "Unix Makefiles" -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -250,7 +261,7 @@ Windows x86:
- - | - - |
# make # make
echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=build.cmake --keep-going || make --directory=build.cmake --keep-going - cmake --build --preset ninja-x86_mingw_static_vcpkg-debug -- -k -j8 || cmake --build --preset ninja-x86_mingw_static_vcpkg-debug -- -k
- | - |
# make # make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@ -294,7 +305,7 @@ Debian stable:amd64:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -343,7 +354,7 @@ Debian oldstable:amd64:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -394,7 +405,7 @@ Debian stable:i386:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -447,7 +458,7 @@ Debian stable:arm64:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -496,7 +507,7 @@ Debian oldstable:arm64:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -543,7 +554,7 @@ batocera:arm64:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -561,10 +572,12 @@ Windows x64:
when: manual when: manual
allow_failure: true
artifacts: artifacts:
paths: paths:
- "bin/" - "build.cmake/bin/"
- "src/comptime.h" - "build.cmake/src/config.h"
expose_as: "Win64" expose_as: "Win64"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
@ -580,10 +593,18 @@ Windows x64:
# apt_toolchain # apt_toolchain
echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
- apt-get install ninja-build
- |
# apt_development
echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.clang -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ENABLE_DISCORDRPC=OFF -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-mingw-static -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -637,7 +658,7 @@ Debian stable Clang:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.clang -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.clang -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -780,7 +801,7 @@ Alpine 3 GCC:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.alpine3 -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.alpine3 -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -841,7 +862,7 @@ Alpine 3 GCC Dedicated:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.alpine3ded -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.alpine3ded -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# cmake # cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@ -880,7 +901,7 @@ osxcross x86_64:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.osxcross --toolchain /osxcross/toolchain.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.osxcross --toolchain /osxcross/toolchain.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# make # make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@ -923,7 +944,7 @@ osxcross arm64:
- - | - - |
# cmake # cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles" echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- cmake -B build.osxcross --toolchain /osxcross/toolchain.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles" - cmake -B build.osxcross --toolchain /osxcross/toolchain.cmake -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -G "Unix Makefiles"
- | - |
# make # make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"

2
src/acs/call-funcs.cpp
View file

@ -2026,7 +2026,7 @@ bool CallFunc_SetLineRenderStyle(ACSVM::Thread *thread, const ACSVM::Word *argV,
} }
alpha = argV[2]; alpha = argV[2];
alpha = std::clamp(alpha, 0, FRACUNIT); alpha = std::clamp<fixed_t>(alpha, 0, FRACUNIT);
TAG_ITER_LINES(tag, lineId) TAG_ITER_LINES(tag, lineId)
{ {

2
src/cvars.cpp
View file

@ -1201,7 +1201,7 @@ consvar_t cv_kickstartaccel[MAXSPLITSCREENPLAYERS] = {
Player("kickstartaccel4", "Off").on_off().onchange(weaponPrefChange4) Player("kickstartaccel4", "Off").on_off().onchange(weaponPrefChange4)
}; };
consvar_t cv_mindelay = Player("mindelay", "2").min_max(0, 30).onchange(weaponPrefChange); consvar_t cv_mindelay = Player("mindelay", "2").min_max(0, 15).onchange(weaponPrefChange);
extern CV_PossibleValue_t Color_cons_t[]; extern CV_PossibleValue_t Color_cons_t[];
void Color1_OnChange(void); void Color1_OnChange(void);

6
src/d_netcmd.c
View file

@ -2993,6 +2993,12 @@ static void Command_RestartLevel(void)
return; return;
} }
if (K_CanChangeRules(false) == false && CV_CheatsEnabled() == false)
{
CONS_Printf(M_GetText("Cheats must be enabled.\n"));
return;
}
if (cv_kartencore.value != 0) if (cv_kartencore.value != 0)
{ {
newencore = (cv_kartencore.value == 1) || encoremode; newencore = (cv_kartencore.value == 1) || encoremode;

2
src/d_ticcmd.h
View file

@ -22,7 +22,7 @@
extern "C" { extern "C" {
#endif #endif
#define MAXPREDICTTICS 12 #define MAXPREDICTTICS 30
// Button/action code definitions. // Button/action code definitions.
typedef enum typedef enum

10
src/g_build_ticcmd.cpp
View file

@ -64,7 +64,7 @@ INT32 G_BasicDeadZoneCalculation(INT32 magnitude, fixed_t deadZone)
} }
// Calculate how much the magnitude exceeds the deadzone // Calculate how much the magnitude exceeds the deadzone
adjustedMagnitude = std::min(adjustedMagnitude, JOYAXISRANGE) - jdeadzone; adjustedMagnitude = std::min<INT32>(adjustedMagnitude, JOYAXISRANGE) - jdeadzone;
return (adjustedMagnitude * JOYAXISRANGE) / (JOYAXISRANGE - jdeadzone); return (adjustedMagnitude * JOYAXISRANGE) / (JOYAXISRANGE - jdeadzone);
} }
@ -133,10 +133,10 @@ class TiccmdBuilder
joystickvector.yaxis = (normalisedYAxis * normalisedMagnitude) / JOYAXISRANGE; joystickvector.yaxis = (normalisedYAxis * normalisedMagnitude) / JOYAXISRANGE;
// Cap the values so they don't go above the correct maximum // Cap the values so they don't go above the correct maximum
joystickvector.xaxis = std::min(joystickvector.xaxis, JOYAXISRANGE); joystickvector.xaxis = std::min<INT32>(joystickvector.xaxis, JOYAXISRANGE);
joystickvector.xaxis = std::max(joystickvector.xaxis, -JOYAXISRANGE); joystickvector.xaxis = std::max<INT32>(joystickvector.xaxis, -JOYAXISRANGE);
joystickvector.yaxis = std::min(joystickvector.yaxis, JOYAXISRANGE); joystickvector.yaxis = std::min<INT32>(joystickvector.yaxis, JOYAXISRANGE);
joystickvector.yaxis = std::max(joystickvector.yaxis, -JOYAXISRANGE); joystickvector.yaxis = std::max<INT32>(joystickvector.yaxis, -JOYAXISRANGE);
} }
void hook() void hook()

40
src/g_demo.cpp
View file

@ -19,6 +19,7 @@
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "doomdef.h" #include "doomdef.h"
#include "doomtype.h"
#include "console.h" #include "console.h"
#include "d_main.h" #include "d_main.h"
#include "d_player.h" #include "d_player.h"
@ -164,8 +165,13 @@ demoghost *ghosts = NULL;
// - 0x000A (Ring Racers v2.0) // - 0x000A (Ring Racers v2.0)
// - A bug was preventing control after ending a drift. // - A bug was preventing control after ending a drift.
// Older behavior is kept around for staff ghost compat. // Older behavior is kept around for staff ghost compat.
// - Also, polyobject bounce-back was fixed!
// - 0x000B (Ring Racers v2.1 + In dev revisions)
// - SPB cup TA replays were recorded at this time
// - Slope physics changed with a scaling fix
// - 0x000C (Ring Racers v2.2)
#define DEMOVERSION 0x000B #define DEMOVERSION 0x000C
boolean G_CompatLevel(UINT16 level) boolean G_CompatLevel(UINT16 level)
{ {
@ -4135,7 +4141,7 @@ void G_SaveDemo(void)
strindex++; strindex++;
dash = false; dash = false;
} }
else if (!dash) else if (strindex && !dash)
{ {
demo_slug[strindex] = '-'; demo_slug[strindex] = '-';
strindex++; strindex++;
@ -4143,13 +4149,32 @@ void G_SaveDemo(void)
} }
} }
demo_slug[strindex] = 0; if (dash && strindex)
if (dash) demo_slug[strindex-1] = 0; {
strindex--;
}
demo_slug[strindex] = '\0';
if (demo_slug[0] != '\0')
{
// Slug is valid, write the chosen filename.
writepoint = strstr(strrchr(demoname, *PATHSEP), "-") + 1; writepoint = strstr(strrchr(demoname, *PATHSEP), "-") + 1;
demo_slug[128 - (writepoint - demoname) - 4] = 0; demo_slug[128 - (writepoint - demoname) - 4] = 0;
sprintf(writepoint, "%s.lmp", demo_slug); sprintf(writepoint, "%s.lmp", demo_slug);
} }
else if (demo.titlename[0] == '\0')
{
// Slug is completely blank? Will crash if we attempt to save
// No bailout because empty seems like a good "no thanks" choice
G_ResetDemoRecording();
return;
}
// If a title that is invalid is provided, the user clearly wanted
// to save. But we can't do so at that name, so we only apply the
// title INSIDE the file, not in the naked filesystem.
// (A hypothetical example is bamboozling bot behaviour causing
// a player to write "?????????".) ~toast 010524
}
length = *(UINT32 *)demoinfo_p; length = *(UINT32 *)demoinfo_p;
WRITEUINT32(demoinfo_p, length); WRITEUINT32(demoinfo_p, length);
@ -4174,8 +4199,11 @@ void G_SaveDemo(void)
if (gamedata->eversavedreplay == false) if (gamedata->eversavedreplay == false)
{ {
gamedata->eversavedreplay = true; gamedata->eversavedreplay = true;
M_UpdateUnlockablesAndExtraEmblems(true, true); // The following will IMMEDIATELY happen on either next level load
G_SaveGameData(); // or returning to menu, so don't make the sound just to get cut off
//M_UpdateUnlockablesAndExtraEmblems(true, true);
//G_SaveGameData();
gamedata->deferredsave = true;
} }
} }
else else

2
src/hardware/hw_md2.c
View file

@ -592,7 +592,7 @@ modelfound:
fclose(f); fclose(f);
} }
void HWR_AddPlayerModel(int skin) // For skins that were added after startup void HWR_AddPlayerModel(INT32 skin) // For skins that were added after startup
{ {
FILE *f; FILE *f;
char name[24], filename[32]; char name[24], filename[32];

5
src/k_credits.cpp
View file

@ -555,7 +555,6 @@ static boolean F_CreditsPlayDemo(void)
UINT8 ghost_id = M_RandomKey( mapheaderinfo[map_id]->ghostCount ); UINT8 ghost_id = M_RandomKey( mapheaderinfo[map_id]->ghostCount );
brief = mapheaderinfo[map_id]->ghostBrief[ghost_id]; brief = mapheaderinfo[map_id]->ghostBrief[ghost_id];
std::string demo_name = static_cast<const char *>(W_CheckNameForNumPwad(brief->wad, brief->lump));
demo.attract = DEMO_ATTRACT_CREDITS; demo.attract = DEMO_ATTRACT_CREDITS;
demo.ignorefiles = true; demo.ignorefiles = true;
@ -578,7 +577,7 @@ void F_TickCreditsDemoExit(void)
if (!menuactive && M_MenuConfirmPressed(0)) if (!menuactive && M_MenuConfirmPressed(0))
{ {
g_credits.demo_exit = std::max(g_credits.demo_exit, kDemoExitTicCount - 64); g_credits.demo_exit = std::max<tic_t>(g_credits.demo_exit, kDemoExitTicCount - 64);
} }
if (INT32 val = F_CreditsDemoExitFade(); val >= 0) if (INT32 val = F_CreditsDemoExitFade(); val >= 0)
@ -668,7 +667,7 @@ static boolean F_TickCreditsSlide(void)
if (g_credits.transition < FRACUNIT) if (g_credits.transition < FRACUNIT)
{ {
g_credits.transition = std::min(g_credits.transition + (FRACUNIT / TICRATE), FRACUNIT); g_credits.transition = std::min<INT32>(g_credits.transition + (FRACUNIT / TICRATE), FRACUNIT);
if (g_credits.split_slide_id < g_credits.split_slide_strings.size()) if (g_credits.split_slide_id < g_credits.split_slide_strings.size())
{ {

2
src/k_dialogue.cpp
View file

@ -307,7 +307,7 @@ void Dialogue::Tick(void)
} }
} }
slide = std::clamp(slide, 0, FRACUNIT); slide = std::clamp<size_t>(slide, 0, FRACUNIT);
if (slide != FRACUNIT) if (slide != FRACUNIT)
{ {

2
src/k_director.cpp
View file

@ -219,7 +219,7 @@ private:
if (playerstat[position].gap >= BREAKAWAYDIST) if (playerstat[position].gap >= BREAKAWAYDIST)
{ {
playerstat[position].boredom = std::min(BOREDOMTIME * 2, playerstat[position].boredom + 1); playerstat[position].boredom = std::min<INT32>(BOREDOMTIME * 2, playerstat[position].boredom + 1);
} }
else if (playerstat[position].boredom > 0) else if (playerstat[position].boredom > 0)
{ {

2
src/k_endcam.cpp
View file

@ -34,7 +34,7 @@ namespace
fixed_t interval(tic_t t, tic_t d) fixed_t interval(tic_t t, tic_t d)
{ {
return (std::min(t, d) * FRACUNIT) / std::max(d, 1u); return (std::min(t, d) * FRACUNIT) / std::max<tic_t>(d, 1u);
} }
fixed_t interval(tic_t t, tic_t s, tic_t d) fixed_t interval(tic_t t, tic_t s, tic_t d)

12
src/k_hud.cpp
View file

@ -1698,7 +1698,7 @@ static void K_drawKartItem(void)
// Quick Eggman numbers // Quick Eggman numbers
if (stplyr->eggmanexplode > 1) if (stplyr->eggmanexplode > 1)
V_DrawScaledPatch(fx+17, fy+13-offset, V_HUDTRANS|V_SLIDEIN|fflags, kp_eggnum[std::min(5, G_TicsToSeconds(stplyr->eggmanexplode))]); V_DrawScaledPatch(fx+17, fy+13-offset, V_HUDTRANS|V_SLIDEIN|fflags, kp_eggnum[std::min<INT32>(5, G_TicsToSeconds(stplyr->eggmanexplode))]);
if (stplyr->itemtype == KITEM_FLAMESHIELD && stplyr->flamelength > 0) if (stplyr->itemtype == KITEM_FLAMESHIELD && stplyr->flamelength > 0)
{ {
@ -2695,7 +2695,7 @@ static void K_drawBossHealthBar(void)
; ;
else if (bossinfo.visualbarimpact) else if (bossinfo.visualbarimpact)
{ {
INT32 mag = std::min((bossinfo.visualbarimpact/4) + 1, 8u); INT32 mag = std::min<UINT32>((bossinfo.visualbarimpact/4) + 1, 8u);
if (bossinfo.visualbarimpact & 1) if (bossinfo.visualbarimpact & 1)
starty -= mag; starty -= mag;
else else
@ -3864,7 +3864,7 @@ static void K_DrawNameTagSphereMeter(INT32 x, INT32 y, INT32 width, INT32 sphere
// see also K_drawBlueSphereMeter // see also K_drawBlueSphereMeter
const UINT8 segColors[] = {73, 64, 52, 54, 55, 35, 34, 33, 202, 180, 181, 182, 164, 165, 166, 153, 152}; const UINT8 segColors[] = {73, 64, 52, 54, 55, 35, 34, 33, 202, 180, 181, 182, 164, 165, 166, 153, 152};
spheres = std::clamp(spheres, 0, 40); spheres = std::clamp<INT32>(spheres, 0, 40);
int colorIndex = (spheres * sizeof segColors) / (40 + 1); int colorIndex = (spheres * sizeof segColors) / (40 + 1);
int px = r_splitscreen > 1 ? 1 : 2; int px = r_splitscreen > 1 ? 1 : 2;
@ -5297,7 +5297,7 @@ static void K_drawInput(void)
char mode = ((stplyr->pflags & PF_ANALOGSTICK) ? '4' : '2') + (r_splitscreen > 1); char mode = ((stplyr->pflags & PF_ANALOGSTICK) ? '4' : '2') + (r_splitscreen > 1);
bool local = !demo.playback && P_IsMachineLocalPlayer(stplyr); bool local = !demo.playback && P_IsMachineLocalPlayer(stplyr);
fixed_t slide = K_GetDialogueSlide(FRACUNIT); fixed_t slide = K_GetDialogueSlide(FRACUNIT);
INT32 tallySlide = [] INT32 tallySlide = []() -> INT32
{ {
if (r_splitscreen <= 1) if (r_splitscreen <= 1)
{ {
@ -5311,7 +5311,7 @@ static void K_drawInput(void)
if (stplyr->tally.state == TALLY_ST_GOTTHRU_SLIDEIN || if (stplyr->tally.state == TALLY_ST_GOTTHRU_SLIDEIN ||
stplyr->tally.state == TALLY_ST_GAMEOVER_SLIDEIN) stplyr->tally.state == TALLY_ST_GAMEOVER_SLIDEIN)
{ {
return Easing_OutQuad(std::min<fixed_t>(stplyr->tally.transition * 2, FRACUNIT), 0, kSlideDown); return static_cast<INT32>(Easing_OutQuad(std::min<fixed_t>(stplyr->tally.transition * 2, FRACUNIT), 0, kSlideDown));
} }
return kSlideDown; return kSlideDown;
}(); }();
@ -5350,7 +5350,7 @@ static void K_drawChallengerScreen(void)
19,20,19,20,19,20,19,20,19,20, // frame 20-21, 1 tic, 5 alternating: all text vibrates from impact 19,20,19,20,19,20,19,20,19,20, // frame 20-21, 1 tic, 5 alternating: all text vibrates from impact
21,22,23,24 // frame 22-25, 1 tic: CHALLENGER turns gold 21,22,23,24 // frame 22-25, 1 tic: CHALLENGER turns gold
}; };
const UINT8 offset = std::min(52-1u, (3*TICRATE)-mapreset); const UINT8 offset = std::min<UINT32>(52-1u, (3*TICRATE)-mapreset);
V_DrawFadeScreen(0xFF00, 16); // Fade out V_DrawFadeScreen(0xFF00, 16); // Fade out
V_DrawScaledPatch(0, 0, 0, kp_challenger[anim[offset]]); V_DrawScaledPatch(0, 0, 0, kp_challenger[anim[offset]]);

8
src/k_hud_track.cpp
View file

@ -752,10 +752,10 @@ void K_CullTargetList(std::vector<TargetTracking>& targetList)
y2 = tr.result.y + kTrackerRadius; y2 = tr.result.y + kTrackerRadius;
} }
x1 = std::max(x1 / kBlockWidth / FRACUNIT, 0); x1 = std::max<INT32>(x1 / kBlockWidth / FRACUNIT, 0);
x2 = std::min(x2 / kBlockWidth / FRACUNIT, kXBlocks - 1); x2 = std::min<INT32>(x2 / kBlockWidth / FRACUNIT, kXBlocks - 1);
y1 = std::max(y1 / kBlockHeight / FRACUNIT, 0); y1 = std::max<INT32>(y1 / kBlockHeight / FRACUNIT, 0);
y2 = std::min(y2 / kBlockHeight / FRACUNIT, kYBlocks - 1); y2 = std::min<INT32>(y2 / kBlockHeight / FRACUNIT, kYBlocks - 1);
bool allMine = true; bool allMine = true;

1
src/k_kart.c
View file

@ -13531,6 +13531,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->tumbleHeight = 30; // Base tumble bounce height player->tumbleHeight = 30; // Base tumble bounce height
player->trickpanel = TRICKSTATE_NONE; player->trickpanel = TRICKSTATE_NONE;
P_SetPlayerMobjState(player->mo, S_KART_SPINOUT); P_SetPlayerMobjState(player->mo, S_KART_SPINOUT);
if (gametype != GT_TUTORIAL)
K_AddMessageForPlayer(player, "Press <dpad> + <a> to trick!", true, false); K_AddMessageForPlayer(player, "Press <dpad> + <a> to trick!", true, false);
if (player->itemflags & (IF_ITEMOUT|IF_EGGMANOUT)) if (player->itemflags & (IF_ITEMOUT|IF_EGGMANOUT))
{ {

17
src/k_menudraw.c
View file

@ -8093,13 +8093,24 @@ static void M_DrawStatsMaps(void)
return; return;
} }
INT32 mapsunfinished = 0; INT32 mapsunfinished = 0, medalspos;
V_DrawThinString(30, 60, 0, va("x %d/%d", statisticsmenu.gotmedals, statisticsmenu.nummedals)); char *medalcountstr = va("x %d/%d", statisticsmenu.gotmedals, statisticsmenu.nummedals);
V_DrawThinString(30, 60, 0, medalcountstr);
V_DrawMappedPatch(20, 60, 0, W_CachePatchName("GOTITA", PU_CACHE), V_DrawMappedPatch(20, 60, 0, W_CachePatchName("GOTITA", PU_CACHE),
R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_GOLD, GTC_MENUCACHE)); R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_GOLD, GTC_MENUCACHE));
INT32 medalspos = BASEVIDWIDTH - 20; if (gamedata->numspraycans)
{
medalspos = 30 + V_ThinStringWidth(medalcountstr, 0);
medalcountstr = va("x %d/%d", gamedata->gotspraycans, gamedata->numspraycans);
V_DrawThinString(20 + medalspos, 60, 0, medalcountstr);
V_DrawMappedPatch(10 + medalspos, 60, 0, W_CachePatchName("GOTCAN", PU_CACHE),
R_GetTranslationColormap(TC_DEFAULT, gamedata->spraycans[0].col, GTC_MENUCACHE));
}
medalspos = BASEVIDWIDTH - 20;
boolean timeattack[3]; boolean timeattack[3];
timeattack[0] = M_SecretUnlocked(SECRET_TIMEATTACK, true); timeattack[0] = M_SecretUnlocked(SECRET_TIMEATTACK, true);

21
src/k_menufunc.c
View file

@ -210,6 +210,27 @@ static void M_ChangeCvar(INT32 choice)
} }
#endif #endif
if (cvar == &cv_dummyprofileautoroulette &&
// Turning Auto Roulette on
cv_dummyprofileautoroulette.value == 0 &&
// Not setting to default (ie changing the value)
choice != -1)
{
M_StartMessage(
"Turning on Auto Roulette",
"\"Ring Racers\" is not designed with random items in mind. With Auto Roulette, you cannot select the item results you want or select an item early."
"\n"
"You will be at a distinct \x85" "disadvantage. \x80\n"
"\n"
"ARE YOU SURE?",
M_ChangeCvarResponse,
MM_YESNO,
NULL,
NULL
);
return;
}
M_ChangeCvarDirect(choice, cvar); M_ChangeCvarDirect(choice, cvar);
} }

9
src/k_profiles.cpp
View file

@ -518,6 +518,15 @@ void PR_LoadProfiles(void)
converted = true; converted = true;
} }
if (jsprof.version < 3)
{
// Version 2 -> 3:
// - Auto Roulette is turned off again so people have to see the warning message
newprof->autoroulette = false;
converted = true;
}
if (converted) if (converted)
{ {
CONS_Printf("Profile '%s' was converted from version %d to version %d\n", CONS_Printf("Profile '%s' was converted from version %d to version %d\n",

3
src/k_profiles.h
View file

@ -112,8 +112,9 @@ extern "C" {
// Version history: // Version history:
// 1 - first // 1 - first
// 2 - litesteer is off by default, old profiles litesteer // 2 - litesteer is off by default, old profiles litesteer
// 3 - auto roulette is switched off again
// option is reset to default // option is reset to default
#define PROFILEVER 2 #define PROFILEVER 3
#define MAXPROFILES 16 #define MAXPROFILES 16
#define PROFILESFILE "ringprofiles.prf" #define PROFILESFILE "ringprofiles.prf"
#define PROFILE_GUEST 0 #define PROFILE_GUEST 0

47
src/k_roulette.c
View file

@ -1356,7 +1356,7 @@ void K_FillItemRouletteData(const player_t *player, itemroulette_t *const roulet
} }
else if (K_TimeAttackRules() == true) else if (K_TimeAttackRules() == true)
{ {
kartitems_t *presetlist = K_KartItemReelRingSneaker; kartitems_t *presetlist = NULL;
// If the objective is not to go fast, it's to cause serious damage. // If the objective is not to go fast, it's to cause serious damage.
if (battleprisons == true) if (battleprisons == true)
@ -1367,11 +1367,56 @@ void K_FillItemRouletteData(const player_t *player, itemroulette_t *const roulet
{ {
presetlist = K_KartItemReelSPBAttack; presetlist = K_KartItemReelSPBAttack;
} }
else if (gametype == GT_TUTORIAL)
{
presetlist = K_KartItemReelRingSneaker;
}
if (presetlist != NULL)
{
for (i = 0; presetlist[i] != KITEM_NONE; i++) for (i = 0; presetlist[i] != KITEM_NONE; i++)
{ {
K_PushToRouletteItemList(roulette, presetlist[i]); K_PushToRouletteItemList(roulette, presetlist[i]);
} }
}
else
{
// New FREE PLAY behavior;
// every item in the game!
// Create the same item reel given the same inputs.
P_SetRandSeed(PR_ITEM_ROULETTE, ITEM_REEL_SEED);
for (i = 1; i < NUMKARTRESULTS; i++)
{
if (K_ItemEnabled(i) == true)
{
spawnChance[i] = ( totalSpawnChance += 1 );
}
}
while (totalSpawnChance > 0)
{
rngRoll = P_RandomKey(PR_ITEM_ROULETTE, totalSpawnChance);
for (i = 1; i < NUMKARTRESULTS && spawnChance[i] <= rngRoll; i++)
{
continue;
}
K_PushToRouletteItemList(roulette, i);
for (; i < NUMKARTRESULTS; i++)
{
// Be sure to fix the remaining items' odds too.
if (spawnChance[i] > 0)
{
spawnChance[i]--;
}
}
totalSpawnChance--;
}
}
return; return;
} }

6
src/k_tally.cpp
View file

@ -303,7 +303,7 @@ void level_tally_t::Init(player_t *player)
: (tutorialchallenge == TUTORIALSKIP_INPROGRESS && K_IsPlayerLosing(player)) : (tutorialchallenge == TUTORIALSKIP_INPROGRESS && K_IsPlayerLosing(player))
); );
time = std::min(static_cast<INT32>(player->realtime), (100 * 60 * TICRATE) - 1); time = std::min<INT32>(static_cast<INT32>(player->realtime), (100 * 60 * TICRATE) - 1);
ringPool = player->totalring; ringPool = player->totalring;
livesAdded = 0; livesAdded = 0;
@ -372,7 +372,7 @@ void level_tally_t::Init(player_t *player)
{ {
if (playeringame[i] == true && players[i].spectator == false) if (playeringame[i] == true && players[i].spectator == false)
{ {
pointLimit = std::min(pointLimit, static_cast<int>(-players[i].roundscore)); pointLimit = std::min<INT32>(pointLimit, static_cast<int>(-players[i].roundscore));
} }
} }
} }
@ -1439,7 +1439,7 @@ void K_TickPlayerTally(player_t *player)
player->tally.Tick(); player->tally.Tick();
while (player->tally.state != TALLY_ST_DONE && player->tally.state != TALLY_ST_GAMEOVER_DONE); while (player->tally.state != TALLY_ST_DONE && player->tally.state != TALLY_ST_GAMEOVER_DONE);
player->tally.delay = std::min(player->tally.delay, TICRATE); player->tally.delay = std::min<INT32>(player->tally.delay, TICRATE);
if (Y_ShouldDoIntermission()) if (Y_ShouldDoIntermission())
musiccountdown = 2; // gets decremented to 1 in G_Ticker to immediately trigger intermission music [blows raspberry] musiccountdown = 2; // gets decremented to 1 in G_Ticker to immediately trigger intermission music [blows raspberry]

4
src/k_waypoint.cpp
View file

@ -2546,8 +2546,8 @@ static INT32 K_CalculateTrackComplexity(void)
if (delta < 0) if (delta < 0)
{ {
dist_factor = FixedDiv(FRACUNIT, std::max(1, dist_factor)); dist_factor = FixedDiv(FRACUNIT, std::max<fixed_t>(1, dist_factor));
radius_factor = FixedDiv(FRACUNIT, std::max(1, radius_factor)); radius_factor = FixedDiv(FRACUNIT, std::max<fixed_t>(1, radius_factor));
} }
else else
{ {

2
src/lua_hudlib.c
View file

@ -44,7 +44,7 @@ static const char *const hud_disable_options[] = {
"stagetitle", "stagetitle",
"textspectator", "textspectator",
"crosshair", "crosshair",
"score",
"time", "time",
"gametypeinfo", // Bumpers / Karma / Laps depending on gametype "gametypeinfo", // Bumpers / Karma / Laps depending on gametype
"minimap", "minimap",

4
src/m_misc.cpp
View file

@ -779,8 +779,8 @@ static void M_CreateScreenShotPalette(void)
for (i = 0, j = 0; i < 768; i += 3, j++) for (i = 0, j = 0; i < 768; i += 3, j++)
{ {
RGBA_t locpal = ((cv_screenshot_colorprofile.value) RGBA_t locpal = ((cv_screenshot_colorprofile.value)
? pLocalPalette[(std::max(st_palette,0)*256)+j] ? pLocalPalette[(std::max<INT32>(st_palette,0)*256)+j]
: pMasterPalette[(std::max(st_palette,0)*256)+j]); : pMasterPalette[(std::max<INT32>(st_palette,0)*256)+j]);
screenshot_palette[i] = locpal.s.red; screenshot_palette[i] = locpal.s.red;
screenshot_palette[i+1] = locpal.s.green; screenshot_palette[i+1] = locpal.s.green;
screenshot_palette[i+2] = locpal.s.blue; screenshot_palette[i+2] = locpal.s.blue;

4
src/menus/play-char-select.c
View file

@ -777,6 +777,8 @@ static void M_HandleBeginningFollowers(setup_player_t *p)
static void M_HandleBeginningColorsOrFollowers(setup_player_t *p) static void M_HandleBeginningColorsOrFollowers(setup_player_t *p)
{ {
if (p->skin != -1)
S_StartSound(NULL, skins[p->skin].soundsid[S_sfx[sfx_kattk1].skinsound]);
if (M_HandleBeginningColors(p)) if (M_HandleBeginningColors(p))
S_StartSound(NULL, sfx_s3k63); S_StartSound(NULL, sfx_s3k63);
else else
@ -1173,6 +1175,8 @@ static void M_HandleFollowerRotate(setup_player_t *p, UINT8 num)
p->mdepth = CSSTEP_FOLLOWERCOLORS; p->mdepth = CSSTEP_FOLLOWERCOLORS;
M_NewPlayerColors(p); M_NewPlayerColors(p);
S_StartSound(NULL, sfx_s3k63); S_StartSound(NULL, sfx_s3k63);
if (p->followern != -1)
S_StartSound(NULL, followers[p->followern].hornsound);
} }
else else
{ {

2
src/menus/transient/pause-addonoptions.cpp
View file

@ -267,7 +267,7 @@ void draw_menu()
K_drawButton((draw.x() + 8) * FRACUNIT, (draw.y() + 8) * FRACUNIT, 0, kp_button_y[0], M_MenuButtonHeld(0, MBT_Y)); K_drawButton((draw.x() + 8) * FRACUNIT, (draw.y() + 8) * FRACUNIT, 0, kp_button_y[0], M_MenuButtonHeld(0, MBT_Y));
draw = draw.y(32 + kMargin); draw = draw.y(32 + kMargin);
currentMenu->y = std::min(static_cast<int>(draw.y()), (BASEVIDHEIGHT/2) - g_menu_offsets[itemOn]); currentMenu->y = std::min(static_cast<INT32>(draw.y()), (BASEVIDHEIGHT/2) - g_menu_offsets[itemOn]);
V_SetClipRect(0, draw.y() * FRACUNIT, BASEVIDWIDTH * FRACUNIT, (BASEVIDHEIGHT - draw.y() - kMargin) * FRACUNIT, 0); V_SetClipRect(0, draw.y() * FRACUNIT, BASEVIDWIDTH * FRACUNIT, (BASEVIDHEIGHT - draw.y() - kMargin) * FRACUNIT, 0);
M_DrawGenericMenu(); M_DrawGenericMenu();

2
src/menus/transient/pause-cheats.cpp
View file

@ -211,7 +211,7 @@ void draw_menu()
K_drawButton((draw.x() + 8) * FRACUNIT, (draw.y() + 8) * FRACUNIT, 0, kp_button_y[0], M_MenuButtonHeld(0, MBT_Y)); K_drawButton((draw.x() + 8) * FRACUNIT, (draw.y() + 8) * FRACUNIT, 0, kp_button_y[0], M_MenuButtonHeld(0, MBT_Y));
draw = draw.y(32 + kMargin); draw = draw.y(32 + kMargin);
currentMenu->y = std::min(static_cast<int>(draw.y()), (BASEVIDHEIGHT/2) - g_menu_offsets[itemOn]); currentMenu->y = std::min(static_cast<INT32>(draw.y()), (BASEVIDHEIGHT/2) - g_menu_offsets[itemOn]);
V_SetClipRect(0, draw.y() * FRACUNIT, BASEVIDWIDTH * FRACUNIT, (BASEVIDHEIGHT - draw.y() - kMargin) * FRACUNIT, 0); V_SetClipRect(0, draw.y() * FRACUNIT, BASEVIDWIDTH * FRACUNIT, (BASEVIDHEIGHT - draw.y() - kMargin) * FRACUNIT, 0);
M_DrawGenericMenu(); M_DrawGenericMenu();

4
src/objects/checkpoint.cpp
View file

@ -181,7 +181,7 @@ struct Checkpoint : mobj_t
if (!clip_var()) if (!clip_var())
{ {
speed(speed() - FixedDiv(speed() / 50, std::max(speed_multiplier(), 1))); speed(speed() - FixedDiv(speed() / 50, std::max<fixed_t>(speed_multiplier(), 1)));
} }
} }
else if (!activated()) else if (!activated())
@ -324,7 +324,7 @@ private:
if (xy_momentum) if (xy_momentum)
{ {
P_Thrust(p, dir, xy_momentum); P_Thrust(p, dir, xy_momentum);
p->momz = P_RandomKey(PR_DECORATION, std::max(z_momentum, 1)); p->momz = P_RandomKey(PR_DECORATION, std::max<fixed_t>(z_momentum, 1));
p->destscale = 0; p->destscale = 0;
p->scalespeed = p->scale / 35; p->scalespeed = p->scale / 35;
p->color = SKINCOLOR_ULTRAMARINE; p->color = SKINCOLOR_ULTRAMARINE;

2
src/objects/destroyed-kart.cpp
View file

@ -387,7 +387,7 @@ private:
{ {
fixed_t f = burning() * FRACUNIT / burn_duration(); fixed_t f = burning() * FRACUNIT / burn_duration();
if ((leveltime % std::max(1, Easing_OutCubic(f, 8, 1))) == 0) if ((leveltime % std::max<fixed_t>(1, Easing_OutCubic(f, 8, 1))) == 0)
{ {
vfx(f); vfx(f);
} }

2
src/objects/gachabom-rebound.cpp
View file

@ -127,7 +127,7 @@ void chase_rebound_target(mobj_t* mobj)
mobj->momz = zDelta / 4; mobj->momz = zDelta / 4;
const tic_t t = distance_to_target(mobj) / travelDistance; const tic_t t = distance_to_target(mobj) / travelDistance;
const fixed_t newSpeed = std::abs(mobj->scale - mobj->destscale) / std::max(t, 1u); const fixed_t newSpeed = std::abs(mobj->scale - mobj->destscale) / std::max<tic_t>(t, 1u);
if (newSpeed > mobj->scalespeed) if (newSpeed > mobj->scalespeed)
{ {

2
src/objects/powerup-spinner.cpp
View file

@ -45,7 +45,7 @@ struct Spinner : Mobj
void think() void think()
{ {
fixed_t f = FRACUNIT - std::clamp(fuse, 0, duration()) * FRACUNIT / std::max(duration(), 1); fixed_t f = FRACUNIT - std::clamp<INT32>(fuse, 0, duration()) * FRACUNIT / std::max<INT32>(duration(), 1);
if (fuse == duration() - 20) if (fuse == duration() - 20)
{ {

2
src/objects/pulley.cpp
View file

@ -246,7 +246,7 @@ private:
return; return;
rope()->z = hook()->top(); rope()->z = hook()->top();
rope()->spriteyscale(Fixed {std::max(0, z - hook()->top())} / std::max<Fixed>(1, 32 * rope()->scale())); rope()->spriteyscale(Fixed {std::max<fixed_t>(0, z - hook()->top())} / std::max<Fixed>(1, 32 * rope()->scale()));
} }
}; };

4
src/p_map.c
View file

@ -2186,6 +2186,8 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y, TryMoveResult_t *re
} }
} }
P_ClearTestLines();
// The bounding box is extended by MAXRADIUS // The bounding box is extended by MAXRADIUS
// because mobj_ts are grouped into mapblocks // because mobj_ts are grouped into mapblocks
// based on their origin point, and can overlap // based on their origin point, and can overlap
@ -2323,8 +2325,6 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y, TryMoveResult_t *re
validcount++; validcount++;
P_ClearTestLines();
// check lines // check lines
for (bx = xl; bx <= xh; bx++) for (bx = xl; bx <= xh; bx++)
{ {

4
src/p_polyobj.c
View file

@ -201,6 +201,10 @@ boolean P_BBoxInsidePolyobj(polyobj_t *po, fixed_t *bbox)
{ {
if (P_BoxOnLineSide(bbox, po->lines[i]) == 0) if (P_BoxOnLineSide(bbox, po->lines[i]) == 0)
return false; return false;
if (g_tm.sweep && !G_CompatLevel(0x000A))
{
P_TestLine(po->lines[i]);
}
} }
return true; return true;

12
src/p_setup.cpp
View file

@ -3444,8 +3444,8 @@ static void P_ProcessLinedefsAfterSidedefs(void)
if (ld->flags & ML_DONTPEGBOTTOM) // alternate alpha (by texture offsets) if (ld->flags & ML_DONTPEGBOTTOM) // alternate alpha (by texture offsets)
{ {
extracolormap_t *exc = R_CopyColormap(sides[ld->sidenum[0]].colormap_data, false); extracolormap_t *exc = R_CopyColormap(sides[ld->sidenum[0]].colormap_data, false);
INT16 alpha = std::max(std::min(sides[ld->sidenum[0]].textureoffset >> FRACBITS, 25), -25); INT16 alpha = std::max<fixed_t>(std::min<fixed_t>(sides[ld->sidenum[0]].textureoffset >> FRACBITS, 25), -25);
INT16 fadealpha = std::max(std::min(sides[ld->sidenum[0]].rowoffset >> FRACBITS, 25), -25); INT16 fadealpha = std::max<fixed_t>(std::min<fixed_t>(sides[ld->sidenum[0]].rowoffset >> FRACBITS, 25), -25);
// If alpha is negative, set "subtract alpha" flag and store absolute value // If alpha is negative, set "subtract alpha" flag and store absolute value
if (alpha < 0) if (alpha < 0)
@ -5840,12 +5840,12 @@ static void P_ConvertBinaryLinedefTypes(void)
lines[i].args[0] = tag; lines[i].args[0] = tag;
if (lines[i].flags & ML_DONTPEGBOTTOM) if (lines[i].flags & ML_DONTPEGBOTTOM)
{ {
lines[i].args[1] = std::max(sides[lines[i].sidenum[0]].textureoffset >> FRACBITS, 0); lines[i].args[1] = std::max<fixed_t>(sides[lines[i].sidenum[0]].textureoffset >> FRACBITS, 0);
// failsafe: if user specifies Back Y Offset and NOT Front Y Offset, use the Back Offset // failsafe: if user specifies Back Y Offset and NOT Front Y Offset, use the Back Offset
// to be consistent with other light and fade specials // to be consistent with other light and fade specials
lines[i].args[2] = ((lines[i].sidenum[1] != 0xFFFF && !(sides[lines[i].sidenum[0]].rowoffset >> FRACBITS)) ? lines[i].args[2] = ((lines[i].sidenum[1] != 0xFFFF && !(sides[lines[i].sidenum[0]].rowoffset >> FRACBITS)) ?
std::max(std::min(sides[lines[i].sidenum[1]].rowoffset >> FRACBITS, 255), 0) std::max<fixed_t>(std::min<fixed_t>(sides[lines[i].sidenum[1]].rowoffset >> FRACBITS, 255), 0)
: std::max(std::min(sides[lines[i].sidenum[0]].rowoffset >> FRACBITS, 255), 0)); : std::max<fixed_t>(std::min<fixed_t>(sides[lines[i].sidenum[0]].rowoffset >> FRACBITS, 255), 0));
} }
else else
{ {
@ -7901,7 +7901,7 @@ static void P_LoadRecordGhosts(void)
savebuffer_t buf = {0}; savebuffer_t buf = {0};
staffbrief_t* ghostbrief = mapheaderinfo[gamemap-1]->ghostBrief[i - 1]; staffbrief_t* ghostbrief = mapheaderinfo[gamemap-1]->ghostBrief[i - 1];
const char* lumpname = W_CheckNameForNumPwad(ghostbrief->wad, ghostbrief->lump); const char* lumpname = W_CheckLongNameForNumPwad(ghostbrief->wad, ghostbrief->lump);
size_t lumplength = W_LumpLengthPwad(ghostbrief->wad, ghostbrief->lump); size_t lumplength = W_LumpLengthPwad(ghostbrief->wad, ghostbrief->lump);
if (lumplength == 0) if (lumplength == 0)
{ {

4
src/p_user.c
View file

@ -1917,7 +1917,11 @@ static void P_3dMovement(player_t *player)
vector3_t totalthrust; vector3_t totalthrust;
totalthrust.x = totalthrust.y = 0; // I forget if this is needed totalthrust.x = totalthrust.y = 0; // I forget if this is needed
if (G_CompatLevel(0x000B)) // Ring Racers 2.1 behavior
totalthrust.z = FRACUNIT*P_MobjFlip(player->mo)/3; // A bit of extra push-back on slopes totalthrust.z = FRACUNIT*P_MobjFlip(player->mo)/3; // A bit of extra push-back on slopes
else
totalthrust.z = FixedMul(mapobjectscale, K_GrowShrinkSpeedMul(player))*P_MobjFlip(player->mo)/3; // A bit of extra push-back on slopes, but scaled for mapobject and player size
if (K_SlopeResistance(player) == true) if (K_SlopeResistance(player) == true)
{ {

4
src/r_debug.cpp
View file

@ -46,7 +46,7 @@ INT32 R_AdjustLightLevel(INT32 light)
if (!debugrender_highlight && cv_debugrender_contrast.value == 0) if (!debugrender_highlight && cv_debugrender_contrast.value == 0)
{ {
const fixed_t darken = FixedMul(FixedMul(g_darkness.value[R_GetViewNumber()], mapheaderinfo[gamemap-1]->darkness), kRange); const fixed_t darken = FixedMul(FixedMul(g_darkness.value[R_GetViewNumber()], mapheaderinfo[gamemap-1]->darkness), kRange);
return std::clamp((light * FRACUNIT) - darken, 0, kRange) / FRACUNIT; return std::clamp<size_t>((light * FRACUNIT) - darken, 0, kRange) / FRACUNIT;
} }
const fixed_t adjust = FixedMul(cv_debugrender_contrast.value, kRange); const fixed_t adjust = FixedMul(cv_debugrender_contrast.value, kRange);
@ -60,7 +60,7 @@ INT32 R_AdjustLightLevel(INT32 light)
} }
else else
{ {
light = std::clamp((light * FRACUNIT) - adjust, 0, kRange); light = std::clamp<size_t>((light * FRACUNIT) - adjust, 0, kRange);
} }
return light / FRACUNIT; return light / FRACUNIT;

2
src/r_plane.cpp
View file

@ -237,7 +237,7 @@ static void R_MapTiltedPlane(drawspandata_t *ds, void(*spanfunc)(drawspandata_t*
{ {
ds->bgofs = R_CalculateRippleOffset(ds, y); ds->bgofs = R_CalculateRippleOffset(ds, y);
R_SetTiltedSpan(ds, std::clamp(y, 0, viewheight)); R_SetTiltedSpan(ds, std::clamp<INT32>(y, 0, viewheight));
R_CalculatePlaneRipple(ds, ds->currentplane->viewangle + ds->currentplane->plangle); R_CalculatePlaneRipple(ds, ds->currentplane->viewangle + ds->currentplane->plangle);
R_SetSlopePlaneVectors(ds, ds->currentplane, y, (ds->xoffs + ds->planeripple.xfrac), (ds->yoffs + ds->planeripple.yfrac)); R_SetSlopePlaneVectors(ds, ds->currentplane, y, (ds->xoffs + ds->planeripple.xfrac), (ds->yoffs + ds->planeripple.yfrac));

4
src/r_segs.cpp
View file

@ -215,7 +215,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
ldef = curline->linedef; ldef = curline->linedef;
tripwire = P_IsLineTripWire(ldef); tripwire = P_IsLineTripWire(ldef);
range = std::max(drawseg->x2-drawseg->x1, 1); range = std::max<INT32>(drawseg->x2-drawseg->x1, 1);
// Setup lighting based on the presence/lack-of 3D floors. // Setup lighting based on the presence/lack-of 3D floors.
dc->numlights = 0; dc->numlights = 0;
@ -874,7 +874,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
R_SetColumnFunc(COLDRAWFUNC_FOG, brightmapped); R_SetColumnFunc(COLDRAWFUNC_FOG, brightmapped);
} }
range = std::max(ds->x2-ds->x1, 1); range = std::max<INT32>(ds->x2-ds->x1, 1);
//SoM: Moved these up here so they are available for my lightlist calculations //SoM: Moved these up here so they are available for my lightlist calculations
rw_scalestep = ds->scalestep; rw_scalestep = ds->scalestep;
spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep; spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;

10
src/r_things.cpp
View file

@ -1082,7 +1082,7 @@ static void R_DrawVisSprite(vissprite_t *vis)
// Vertically sheared sprite // Vertically sheared sprite
for (dc.x = vis->x1; dc.x <= vis->x2; dc.x++, frac += vis->xiscale, dc.texturemid -= vis->shear.tan) for (dc.x = vis->x1; dc.x <= vis->x2; dc.x++, frac += vis->xiscale, dc.texturemid -= vis->shear.tan)
{ {
texturecolumn = std::clamp(frac >> FRACBITS, 0, patch->width - 1); texturecolumn = std::clamp<fixed_t>(frac >> FRACBITS, 0, patch->width - 1);
column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn])); column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn]));
if (bmpatch) if (bmpatch)
@ -1119,7 +1119,7 @@ static void R_DrawVisSprite(vissprite_t *vis)
// Non-paper drawing loop // Non-paper drawing loop
for (dc.x = vis->x1; dc.x <= vis->x2; dc.x++, frac += vis->xiscale, sprtopscreen += vis->shear.tan) for (dc.x = vis->x1; dc.x <= vis->x2; dc.x++, frac += vis->xiscale, sprtopscreen += vis->shear.tan)
{ {
texturecolumn = std::clamp(frac >> FRACBITS, 0, patch->width - 1); texturecolumn = std::clamp<fixed_t>(frac >> FRACBITS, 0, patch->width - 1);
column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn])); column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn]));
@ -2373,7 +2373,7 @@ static void R_ProjectSprite(mobj_t *thing)
} }
// Less change in contrast in dark sectors // Less change in contrast in dark sectors
extralight = FixedMul(extralight, std::min(std::max(0, lightnum), LIGHTLEVELS - 1) * FRACUNIT / (LIGHTLEVELS - 1)); extralight = FixedMul(extralight, std::min<INT32>(std::max<INT32>(0, lightnum), LIGHTLEVELS - 1) * FRACUNIT / (LIGHTLEVELS - 1));
if (papersprite) if (papersprite)
{ {
@ -2385,7 +2385,7 @@ static void R_ProjectSprite(mobj_t *thing)
fixed_t n = FixedDiv(FixedMul(xscale, LIGHTRESOLUTIONFIX), ((MAXLIGHTSCALE-1) << LIGHTSCALESHIFT)); fixed_t n = FixedDiv(FixedMul(xscale, LIGHTRESOLUTIONFIX), ((MAXLIGHTSCALE-1) << LIGHTSCALESHIFT));
// Less change in contrast at further distances, to counteract DOOM diminished light // Less change in contrast at further distances, to counteract DOOM diminished light
extralight = FixedMul(extralight, std::min(n, FRACUNIT)); extralight = FixedMul(extralight, std::min<fixed_t>(n, FRACUNIT));
// Contrast is stronger for normal sprites, stronger than wall lighting is at the same distance // Contrast is stronger for normal sprites, stronger than wall lighting is at the same distance
lightnum += FixedFloor((extralight / 4) + (FRACUNIT / 2)) / FRACUNIT; lightnum += FixedFloor((extralight / 4) + (FRACUNIT / 2)) / FRACUNIT;
@ -2551,7 +2551,7 @@ static void R_ProjectSprite(mobj_t *thing)
lindex = FixedMul(xscale, LIGHTRESOLUTIONFIX)>>(LIGHTSCALESHIFT); lindex = FixedMul(xscale, LIGHTRESOLUTIONFIX)>>(LIGHTSCALESHIFT);
// Mitigate against negative xscale and arithmetic overflow // Mitigate against negative xscale and arithmetic overflow
lindex = std::clamp(lindex, 0, MAXLIGHTSCALE - 1); lindex = std::clamp<INT32>(lindex, 0, MAXLIGHTSCALE - 1);
if (vis->cut & SC_SEMIBRIGHT) if (vis->cut & SC_SEMIBRIGHT)
lindex = (MAXLIGHTSCALE/2) + (lindex >> 1); lindex = (MAXLIGHTSCALE/2) + (lindex >> 1);

2
src/rhi/gl2/gl2_rhi.cpp
View file

@ -1918,7 +1918,7 @@ void Gl2Rhi::finish()
// I sure hope creating FBOs isn't costly on the driver! // I sure hope creating FBOs isn't costly on the driver!
for (auto& fbset : framebuffers_) for (auto& fbset : framebuffers_)
{ {
gl_->DeleteFramebuffers(1, &fbset.second); gl_->DeleteFramebuffers(1, (GLuint*)&fbset.second);
GL_ASSERT; GL_ASSERT;
} }
framebuffers_.clear(); framebuffers_.clear();

2
src/sdl/i_video.cpp
View file

@ -171,7 +171,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen);
//static void Impl_SetWindowName(const char *title); //static void Impl_SetWindowName(const char *title);
static void Impl_SetWindowIcon(void); static void Impl_SetWindowIcon(void);
static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen, SDL_bool reposition) static void SDLSetMode(int width, int height, SDL_bool fullscreen, SDL_bool reposition)
{ {
static SDL_bool wasfullscreen = SDL_FALSE; static SDL_bool wasfullscreen = SDL_FALSE;

2
src/st_stuff.c
View file

@ -1490,7 +1490,7 @@ void ST_DrawSaveReplayHint(INT32 flags)
V_DrawRightAlignedThinString( V_DrawRightAlignedThinString(
BASEVIDWIDTH - 2, 2, BASEVIDWIDTH - 2, 2,
flags|V_YELLOWMAP, flags|V_YELLOWMAP,
demo.willsave ? "Replay will be saved. \xAB Change title" : "\xAB or \xAD Save replay" (demo.willsave && demo.titlename[0]) ? "Replay will be saved. \xAB Change title" : "\xAB or \xAD Save replay"
); );
} }

18
src/v_video.cpp
View file

@ -1088,8 +1088,8 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
if (y < clip->top) if (y < clip->top)
y = clip->top; y = clip->top;
w = std::max(0, x2 - x); w = std::max<INT32>(0, x2 - x);
h = std::max(0, y2 - y); h = std::max<INT32>(0, y2 - y);
} }
g_2d.begin_quad() g_2d.begin_quad()
@ -2117,7 +2117,7 @@ void V_DrawTitleCardStringFixed(fixed_t x, fixed_t y, fixed_t scale, const char
// otherwise; scalex must start at 0 // otherwise; scalex must start at 0
// let's have each letter do 4 spins (360*4 + 90 = 1530 "degrees") // let's have each letter do 4 spins (360*4 + 90 = 1530 "degrees")
fakeang = std::min(360 + 90, let_time*41) * ANG1; fakeang = std::min<INT32>(360 + 90, let_time*41) * ANG1;
scalex = FINESINE(fakeang>>ANGLETOFINESHIFT); scalex = FINESINE(fakeang>>ANGLETOFINESHIFT);
} }
else if (!bossmode && let_time > threshold) else if (!bossmode && let_time > threshold)
@ -2125,7 +2125,7 @@ void V_DrawTitleCardStringFixed(fixed_t x, fixed_t y, fixed_t scale, const char
// Make letters disappear... // Make letters disappear...
let_time -= threshold; let_time -= threshold;
fakeang = std::max(0, (360+90) - let_time*41)*ANG1; fakeang = std::max<INT32>(0, (360+90) - let_time*41)*ANG1;
scalex = FINESINE(fakeang>>ANGLETOFINESHIFT); scalex = FINESINE(fakeang>>ANGLETOFINESHIFT);
} }
@ -2205,7 +2205,7 @@ static inline fixed_t BunchedCharacterDim(
(void)chw; (void)chw;
(void)hchw; (void)hchw;
(void)dupx; (void)dupx;
(*cwp) = FixedMul(std::max(1, (*cwp) - 1) << FRACBITS, scale); (*cwp) = FixedMul(std::max<INT32>(1, (*cwp) - 1) << FRACBITS, scale);
return 0; return 0;
} }
@ -2219,7 +2219,7 @@ static inline fixed_t MenuCharacterDim(
(void)chw; (void)chw;
(void)hchw; (void)hchw;
(void)dupx; (void)dupx;
(*cwp) = FixedMul(std::max(1, (*cwp) - 2) << FRACBITS, scale); (*cwp) = FixedMul(std::max<INT32>(1, (*cwp) - 2) << FRACBITS, scale);
return 0; return 0;
} }
@ -2233,7 +2233,7 @@ static inline fixed_t GamemodeCharacterDim(
(void)chw; (void)chw;
(void)hchw; (void)hchw;
(void)dupx; (void)dupx;
(*cwp) = FixedMul(std::max(1, (*cwp) - 2) << FRACBITS, scale); (*cwp) = FixedMul(std::max<INT32>(1, (*cwp) - 2) << FRACBITS, scale);
return 0; return 0;
} }
@ -2247,7 +2247,7 @@ static inline fixed_t FileCharacterDim(
(void)chw; (void)chw;
(void)hchw; (void)hchw;
(void)dupx; (void)dupx;
(*cwp) = FixedMul(std::max(1, (*cwp) - 3) << FRACBITS, scale); (*cwp) = FixedMul(std::max<INT32>(1, (*cwp) - 3) << FRACBITS, scale);
return 0; return 0;
} }
@ -2261,7 +2261,7 @@ static inline fixed_t LSTitleCharacterDim(
(void)chw; (void)chw;
(void)hchw; (void)hchw;
(void)dupx; (void)dupx;
(*cwp) = FixedMul(std::max(1, (*cwp) - 4) << FRACBITS, scale); (*cwp) = FixedMul(std::max<INT32>(1, (*cwp) - 4) << FRACBITS, scale);
return 0; return 0;
} }

13
src/w_wad.cpp
View file

@ -1021,6 +1021,19 @@ const char *W_CheckNameForNum(lumpnum_t lumpnum)
return W_CheckNameForNumPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum)); return W_CheckNameForNumPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum));
} }
const char *W_CheckLongNameForNumPwad(UINT16 wad, UINT16 lump)
{
if (lump >= wadfiles[wad]->numlumps || !TestValidLump(wad, 0))
return NULL;
return wadfiles[wad]->lumpinfo[lump].longname;
}
const char *W_CheckLongNameForNum(lumpnum_t lumpnum)
{
return W_CheckLongNameForNumPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum));
}
// //
// wadid is a wad number // wadid is a wad number
// (Used for sprites loading) // (Used for sprites loading)

2
src/w_wad.h
View file

@ -154,6 +154,8 @@ INT32 W_InitMultipleFiles(char **filenames, boolean addons);
const char *W_CheckNameForNumPwad(UINT16 wad, UINT16 lump); const char *W_CheckNameForNumPwad(UINT16 wad, UINT16 lump);
const char *W_CheckNameForNum(lumpnum_t lumpnum); const char *W_CheckNameForNum(lumpnum_t lumpnum);
const char *W_CheckLongNameForNumPwad(UINT16 wad, UINT16 lump);
const char *W_CheckLongNameForNum(lumpnum_t lumpnum);
UINT16 W_FindNextEmptyInPwad(UINT16 wad, UINT16 startlump); // checks only in one pwad UINT16 W_FindNextEmptyInPwad(UINT16 wad, UINT16 startlump); // checks only in one pwad

4
src/y_inter.cpp
View file

@ -952,7 +952,7 @@ void Y_RoundQueueDrawer(y_data_t *standings, INT32 offset, boolean doanimations,
SINT8 deferxoffs = 0; SINT8 deferxoffs = 0;
const INT32 desiredx2 = (290 + bufferspace); const INT32 desiredx2 = (290 + bufferspace);
spacetospecial = std::max(desiredx2 - widthofroundqueue - (24 - bufferspace), 16); spacetospecial = std::max<INT32>(desiredx2 - widthofroundqueue - (24 - bufferspace), 16);
if (roundqueue.position == roundqueue.size) if (roundqueue.position == roundqueue.size)
{ {
@ -2234,7 +2234,7 @@ void Y_StartIntermission(void)
else else
{ {
// Minimum two seconds for match results, then two second slideover approx halfway through // Minimum two seconds for match results, then two second slideover approx halfway through
sorttic = std::max((timer/2) - 2*TICRATE, 2*TICRATE); sorttic = std::max<INT32>((timer/2) - 2*TICRATE, 2*TICRATE);
} }
// TODO: code's a mess, I'm just making it extra clear // TODO: code's a mess, I'm just making it extra clear

2
thirdparty/libwebm/mkvmuxer/mkvmuxer.h vendored
View file

@ -1770,7 +1770,7 @@ class Segment {
// accounted for. // accounted for.
// index - index in the list of Cues which is currently being adjusted. // index - index in the list of Cues which is currently being adjusted.
// cue_size - sum of size of all the CuePoint elements. // cue_size - sum of size of all the CuePoint elements.
void MoveCuesBeforeClustersHelper(uint64_t diff, int index, void MoveCuesBeforeClustersHelper(uint64_t diff, int32_t index,
uint64_t* cue_size); uint64_t* cue_size);
// Seeds the random number generator used to make UIDs. // Seeds the random number generator used to make UIDs.

9
thirdparty/libwebm/mkvmuxer/mkvmuxertypes.h vendored
View file

@ -8,14 +8,15 @@
#ifndef MKVMUXER_MKVMUXERTYPES_H_ #ifndef MKVMUXER_MKVMUXERTYPES_H_
#define MKVMUXER_MKVMUXERTYPES_H_ #define MKVMUXER_MKVMUXERTYPES_H_
#include <stdint.h>
namespace mkvmuxer { namespace mkvmuxer {
typedef unsigned char uint8; typedef unsigned char uint8;
typedef short int16; typedef short int16;
typedef int int32; typedef int32_t int32;
typedef unsigned int uint32; typedef uint32_t uint32;
typedef long long int64; typedef int64_t int64;
typedef unsigned long long uint64; typedef uint64_t uint64;
} // namespace mkvmuxer } // namespace mkvmuxer
// Copied from Chromium basictypes.h // Copied from Chromium basictypes.h