diff --git a/LUASTUFF.md b/LUASTUFF.md index 28e77bed8..fcc9f313a 100644 --- a/LUASTUFF.md +++ b/LUASTUFF.md @@ -13,10 +13,12 @@ Mainly for use in visual-only addons like secondcolor. **Not netsafe**. Returns player's current sliptide roll angle, taking sliptideroll cvar value into account. -## hud.setVoteBackground(name) +## hud.setVoteBackground(name[, time\_per\_frame]) Changes vote background texture prefix (game looks for PREFIX + "W" or "C" (depends on resolution) + FRAME\_NUMBER). +If time\_per\_frame is set, each frame will last this amount of tics, default value is 2 + ## hud.add(fn, "vote") and hud.add(fn, "intermission") Hud hooks for vote screen and intermission screen. They only get drawer (`v`) as argument. @@ -120,6 +122,11 @@ v.interpLatch(false) ``` When using a custom string drawer, enable this mode to avoid interpolation artifacting when the string changes. +## cameras[] global array + +Local player cameras that can be accessed outside of hud hooks. +`#cameras` will return amount of available cameras. (0 on dedicated server, 1 with 1 player, 4 with 4p splitscreen, etc) + ## mobj.spritexscale, mobj.spriteyscale, mobj.spritexoffset, mobj.spriteyoffset, mobj.rollangle, mobj.sloperoll, mobj.rollmodel fields Same fields as in SRB2 2.2 diff --git a/libs/SDL2/SRB2NOTE.txt b/libs/SDL2/SRB2NOTE.txt index 70d80a6e7..aa5950c29 100644 --- a/libs/SDL2/SRB2NOTE.txt +++ b/libs/SDL2/SRB2NOTE.txt @@ -1,20 +1,15 @@ -# SDL Development Libaries - -Download both the VC and MinGW packages and extract them here. - -https://www.libsdl.org/download-2.0.php - -## VC Package - -* include -* lib - -## MinGW Package - -* i686-w64-mingw32 -* x86_64-w64-mingw32 - -# SRB2Kart Saturn note: -Due to a good amount of issues with newer SDL releases, we decided to ship our own Version of the library. -This version is just the 2.28.5 release with a fix backported for non US keyboard layouts that prevented the right ALT GR key from working properly. -It can be found under: https://github.com/alufolie91/SDL/tree/backportaltgrfix +# SDL Development Libaries + +Download both the VC and MinGW packages and extract them here. + +https://www.libsdl.org/download-2.0.php + +## VC Package + +* include +* lib + +## MinGW Package + +* i686-w64-mingw32 +* x86_64-w64-mingw32 diff --git a/libs/SDL2/i686-w64-mingw32/bin/SDL2.dll b/libs/SDL2/i686-w64-mingw32/bin/SDL2.dll index 17a86d671..573225cab 100644 Binary files a/libs/SDL2/i686-w64-mingw32/bin/SDL2.dll and b/libs/SDL2/i686-w64-mingw32/bin/SDL2.dll differ diff --git a/libs/SDL2/i686-w64-mingw32/bin/sdl2-config b/libs/SDL2/i686-w64-mingw32/bin/sdl2-config index aa99b065a..8352f5564 100644 --- a/libs/SDL2/i686-w64-mingw32/bin/sdl2-config +++ b/libs/SDL2/i686-w64-mingw32/bin/sdl2-config @@ -1,65 +1,65 @@ -#!/bin/sh - -# Get the canonical path of the folder containing this script -bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") - -# Calculate the canonical path of the prefix, relative to the folder of this script -prefix=$(cd -P -- "$bindir/.." && printf '%s\n' "$(pwd -P)") -exec_prefix=${prefix} -exec_prefix_set=no -libdir=${exec_prefix}/lib - -#usage="\ -#Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" -usage="\ -Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" - -if test $# -eq 0; then - echo "${usage}" 1>&2 - exit 1 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo $prefix - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo $exec_prefix - ;; - --version) - echo 2.28.5 - ;; - --cflags) - echo -I${prefix}/include/SDL2 -Dmain=SDL_main - ;; - --libs) - echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows - ;; - --static-libs) -# --libs|--static-libs) - sdl_static_libs=$(echo "-lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g") - echo -L${exec_prefix}/lib $sdl_static_libs - ;; - *) - echo "${usage}" 1>&2 - exit 1 - ;; - esac - shift -done +#!/bin/sh + +# Get the canonical path of the folder containing this script +bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") + +# Calculate the canonical path of the prefix, relative to the folder of this script +prefix=$(cd -P -- "$bindir/.." && printf '%s\n' "$(pwd -P)") +exec_prefix=${prefix} +exec_prefix_set=no +libdir=${exec_prefix}/lib + +#usage="\ +#Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" +usage="\ +Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" + +if test $# -eq 0; then + echo "${usage}" 1>&2 + exit 1 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo $prefix + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo $exec_prefix + ;; + --version) + echo 2.28.5 + ;; + --cflags) + echo -I${prefix}/include/SDL2 -Dmain=SDL_main + ;; + --libs) + echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows + ;; + --static-libs) +# --libs|--static-libs) + sdl_static_libs=$(echo "-lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g") + echo -L${exec_prefix}/lib $sdl_static_libs + ;; + *) + echo "${usage}" 1>&2 + exit 1 + ;; + esac + shift +done diff --git a/libs/SDL2/x86_64-w64-mingw32/bin/SDL2.dll b/libs/SDL2/x86_64-w64-mingw32/bin/SDL2.dll index 9b8adc0ff..e26bcb1c3 100644 Binary files a/libs/SDL2/x86_64-w64-mingw32/bin/SDL2.dll and b/libs/SDL2/x86_64-w64-mingw32/bin/SDL2.dll differ diff --git a/libs/SDL2/x86_64-w64-mingw32/bin/sdl2-config b/libs/SDL2/x86_64-w64-mingw32/bin/sdl2-config index 65b2fd199..a48f6792d 100644 --- a/libs/SDL2/x86_64-w64-mingw32/bin/sdl2-config +++ b/libs/SDL2/x86_64-w64-mingw32/bin/sdl2-config @@ -1,65 +1,65 @@ -#!/bin/sh - -# Get the canonical path of the folder containing this script -bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") - -# Calculate the canonical path of the prefix, relative to the folder of this script -prefix=$(cd -P -- "$bindir/.." && printf '%s\n' "$(pwd -P)") -exec_prefix=${prefix} -exec_prefix_set=no -libdir=${exec_prefix}/lib - -#usage="\ -#Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" -usage="\ -Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" - -if test $# -eq 0; then - echo "${usage}" 1>&2 - exit 1 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo $prefix - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo $exec_prefix - ;; - --version) - echo 2.28.5 - ;; - --cflags) - echo -I${prefix}/include/SDL2 -Dmain=SDL_main - ;; - --libs) - echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows - ;; - --static-libs) -# --libs|--static-libs) - sdl_static_libs=$(echo "-lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g") - echo -L${exec_prefix}/lib $sdl_static_libs - ;; - *) - echo "${usage}" 1>&2 - exit 1 - ;; - esac - shift -done +#!/bin/sh + +# Get the canonical path of the folder containing this script +bindir=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") + +# Calculate the canonical path of the prefix, relative to the folder of this script +prefix=$(cd -P -- "$bindir/.." && printf '%s\n' "$(pwd -P)") +exec_prefix=${prefix} +exec_prefix_set=no +libdir=${exec_prefix}/lib + +#usage="\ +#Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" +usage="\ +Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" + +if test $# -eq 0; then + echo "${usage}" 1>&2 + exit 1 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo $prefix + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo $exec_prefix + ;; + --version) + echo 2.28.5 + ;; + --cflags) + echo -I${prefix}/include/SDL2 -Dmain=SDL_main + ;; + --libs) + echo -L${exec_prefix}/lib -lmingw32 -lSDL2main -lSDL2 -mwindows + ;; + --static-libs) +# --libs|--static-libs) + sdl_static_libs=$(echo "-lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g") + echo -L${exec_prefix}/lib $sdl_static_libs + ;; + *) + echo "${usage}" 1>&2 + exit 1 + ;; + esac + shift +done diff --git a/libs/dll-binaries/i686/SDL2.dll b/libs/dll-binaries/i686/SDL2.dll index 17a86d671..573225cab 100644 Binary files a/libs/dll-binaries/i686/SDL2.dll and b/libs/dll-binaries/i686/SDL2.dll differ diff --git a/libs/dll-binaries/x86_64/SDL2.dll b/libs/dll-binaries/x86_64/SDL2.dll index 9b8adc0ff..e26bcb1c3 100644 Binary files a/libs/dll-binaries/x86_64/SDL2.dll and b/libs/dll-binaries/x86_64/SDL2.dll differ diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c index d3ccfd21d..2951d6da5 100644 --- a/src/hardware/hw_batching.c +++ b/src/hardware/hw_batching.c @@ -214,7 +214,7 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2) const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2; const GLMipmap_t *texture1 = poly1->hash & 0x80000000 ? NULL : poly1->texture; - const GLMipmap_t *texture2 = poly1->hash & 0x80000000 ? NULL : poly2->texture; + const GLMipmap_t *texture2 = poly2->hash & 0x80000000 ? NULL : poly2->texture; // skywalls and horizon lines must retain their order for horizon lines to work if (!texture1 && !texture2) diff --git a/src/m_menu.c b/src/m_menu.c index 3814afcc8..210d6c32f 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -4331,6 +4331,9 @@ static void M_HandleReplayHutList(INT32 choice) if (!replaynamesloaded) return; + if (replayqueryfound == 0) + return; + switch (dirmenu[dir_on[menudepthleft]][DIR_TYPE]) { case EXT_FOLDER: diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp index a256f69b2..55a475c9d 100644 --- a/src/r_bsp.cpp +++ b/src/r_bsp.cpp @@ -515,7 +515,7 @@ const INT32 checkcoord[12][4] = static boolean R_CheckBBox(const fixed_t *bspcoord) { angle_t angle1, angle2; - INT32 sx1, sx2, boxpos; + INT32 sx1, sx2; const INT32* check; // Find the corners of the box