From e73cc794b875da360799143d1c7f84808f19eb6b Mon Sep 17 00:00:00 2001 From: fewtarius Date: Thu, 7 Apr 2022 19:18:33 -0400 Subject: [PATCH] Fix up raze. Default to instant transition. --- .../emulators/raze/config/RG551/raze.ini | 250 +++++++++++++++++- packages/games/emulators/raze/package.mk | 4 +- .../emulators/raze/patches/001-fixes.patch | 110 ++++++++ .../emulationstation/config/es_settings.cfg | 2 +- 4 files changed, 359 insertions(+), 7 deletions(-) create mode 100644 packages/games/emulators/raze/patches/001-fixes.patch diff --git a/packages/games/emulators/raze/config/RG551/raze.ini b/packages/games/emulators/raze/config/RG551/raze.ini index c6247acc8..41dbc64d3 100644 --- a/packages/games/emulators/raze/config/RG551/raze.ini +++ b/packages/games/emulators/raze/config/RG551/raze.ini @@ -2,16 +2,12 @@ # These are the directories to automatically search for game data. # Each directory should be on a separate line, preceded by Path= [GameSearch.Directories] -Path=. -Path=./* -Path=/storage/.config/game/raze Path=/storage/roms/build # These are the directories to search for add-ons added with the -file # command line parameter, if they cannot be found with the path # as-is. Layout is the same as for GameSearch.Directories [FileSearch.Directories] -Path=/storage/.config/game/raze Path=/storage/roms/build # These are the directories to search for soundfonts that let listed in the menu. @@ -584,6 +580,8 @@ Joy15=toggle cl_autorun Joy16=centerview [Duke.DoubleBindings] +Joy7=quickload +Joy8=quicksave [Duke.AutomapBindings] MWheelUp=am_zoom 1.2 @@ -781,3 +779,247 @@ Axis3deadzone=0.300001 Axis3scale=0.6 Axis3map=1 +[Blood.Bindings] +Joy1=+jump +Joy2=+open +Joy3=+Crouch +Joy4=toggle cl_autorun +Joy5=+alt_fire +Joy6=+fire +Joy7=weapprev +Joy8=weapnext +Joy9=menu_main +Joy10=pause +Joy12=togglemap +Joy13=centerview +Joy14=third_person_view +Joy15=invuse +Joy16=invprev +Joy17=invnext +Axis1Plus=+strafe_right +Axis1Minus=+strafe_left +Axis2Plus=+move_backward +Axis2Minus=+move_forward +Axis3Plus=+turn_right +Axis3Minus=+turn_left +Axis4Plus=+look_down +Axis4Minus=+look_up + +[Blood.AutomapBindings] +Joy9=+shrink_screen +Joy10=+enlarge_Screen +Joy13=togglefollow +Axis2Minus=+am_panup +Axis2Plus=+am_pandown +Axis1Minus=+am_panleft +Axis1Plus=+am_panright + +[Exhumed.Bindings] +Joy1=+jump +Joy2=+open +Joy3=+Crouch +Joy4=toggle cl_autorun +Joy5=+alt_fire +Joy6=+fire +Joy7=weapprev +Joy8=weapnext +Joy9=menu_main +Joy10=pause +Joy12=togglemap +Joy13=centerview +Joy14=third_person_view +Joy15=invuse +Joy16=invprev +Joy17=invnext +Axis1Plus=+strafe_right +Axis1Minus=+strafe_left +Axis2Plus=+move_backward +Axis2Minus=+move_forward +Axis3Plus=+turn_right +Axis3Minus=+turn_left +Axis4Plus=+look_down +Axis4Minus=+look_up + +[Nam.Bindings] +Joy1=+jump +Joy2=+open +Joy3=+Crouch +Joy4=toggle cl_autorun +Joy5=+alt_fire +Joy6=+fire +Joy7=weapprev +Joy8=weapnext +Joy9=menu_main +Joy10=pause +Joy12=togglemap +Joy13=centerview +Joy14=third_person_view +Joy15=invuse +Joy16=invprev +Joy17=invnext +Axis1Plus=+strafe_right +Axis1Minus=+strafe_left +Axis2Plus=+move_backward +Axis2Minus=+move_forward +Axis3Plus=+turn_right +Axis3Minus=+turn_left +Axis4Plus=+look_down +Axis4Minus=+look_up + +[Redneck.Bindings] +Joy1=+jump +Joy2=+open +Joy3=+Crouch +Joy4=toggle cl_autorun +Joy5=+alt_fire +Joy6=+fire +Joy7=weapprev +Joy8=weapnext +Joy9=menu_main +Joy10=pause +Joy12=togglemap +Joy13=centerview +Joy14=third_person_view +Joy15=invuse +Joy16=invprev +Joy17=invnext +Axis1Plus=+strafe_right +Axis1Minus=+strafe_left +Axis2Plus=+move_backward +Axis2Minus=+move_forward +Axis3Plus=+turn_right +Axis3Minus=+turn_left +Axis4Plus=+look_down +Axis4Minus=+look_up + +[ShadowWarrior.Bindings] +Joy1=+jump +Joy2=+open +Joy3=+Crouch +Joy4=toggle cl_autorun +Joy5=+alt_fire +Joy6=+fire +Joy7=weapprev +Joy8=weapnext +Joy9=menu_main +Joy10=pause +Joy12=togglemap +Joy13=centerview +Joy14=third_person_view +Joy15=invuse +Joy16=invprev +Joy17=invnext +Axis1Plus=+strafe_right +Axis1Minus=+strafe_left +Axis2Plus=+move_backward +Axis2Minus=+move_forward +Axis3Plus=+turn_right +Axis3Minus=+turn_left +Axis4Plus=+look_down +Axis4Minus=+look_up + +[WW2GI.Bindings] +Joy1=+jump +Joy2=+open +Joy3=+Crouch +Joy4=toggle cl_autorun +Joy5=+alt_fire +Joy6=+fire +Joy7=weapprev +Joy8=weapnext +Joy9=menu_main +Joy10=pause +Joy12=togglemap +Joy13=centerview +Joy14=third_person_view +Joy15=invuse +Joy16=invprev +Joy17=invnext +Axis1Plus=+strafe_right +Axis1Minus=+strafe_left +Axis2Plus=+move_backward +Axis2Minus=+move_forward +Axis3Plus=+turn_right +Axis3Minus=+turn_left +Axis4Plus=+look_down +Axis4Minus=+look_up + +[Duke.Bindings] +Joy1=+jump +Joy2=+open +Joy3=+Crouch +Joy4=toggle cl_autorun +Joy5=+alt_fire +Joy6=+fire +Joy7=weapprev +Joy8=weapnext +Joy9=menu_main +Joy10=pause +Joy12=togglemap +Joy13=centerview +Joy14=third_person_view +Joy15=invuse +Joy16=invprev +Joy17=invnext +Axis1Plus=+strafe_right +Axis1Minus=+strafe_left +Axis2Plus=+move_backward +Axis2Minus=+move_forward +Axis3Plus=+turn_right +Axis3Minus=+turn_left +Axis4Plus=+look_down +Axis4Minus=+look_up + +[Exhumed.AutomapBindings] +Joy9=+shrink_screen +Joy10=+enlarge_Screen +Joy13=togglefollow +Axis2Minus=+am_panup +Axis2Plus=+am_pandown +Axis1Minus=+am_panleft +Axis1Plus=+am_panright + +[Nam.AutomapBindings] +Joy9=+shrink_screen +Joy10=+enlarge_Screen +Joy13=togglefollow +Axis2Minus=+am_panup +Axis2Plus=+am_pandown +Axis1Minus=+am_panleft +Axis1Plus=+am_panright + +[Redneck.AutomapBindings] +Joy9=+shrink_screen +Joy10=+enlarge_Screen +Joy13=togglefollow +Axis2Minus=+am_panup +Axis2Plus=+am_pandown +Axis1Minus=+am_panleft +Axis1Plus=+am_panright + +[ShadowWarrior.AutomapBindings] +Joy9=+shrink_screen +Joy10=+enlarge_Screen +Joy13=togglefollow +Axis2Minus=+am_panup +Axis2Plus=+am_pandown +Axis1Minus=+am_panleft +Axis1Plus=+am_panright + +[WW2GI.AutomapBindings] +Joy9=+shrink_screen +Joy10=+enlarge_Screen +Joy13=togglefollow +Axis2Minus=+am_panup +Axis2Plus=+am_pandown +Axis1Minus=+am_panleft +Axis1Plus=+am_panright + +[Duke.AutomapBindings] +Joy9=+shrink_screen +Joy10=+enlarge_Screen +Joy13=togglefollow +Axis2Minus=+am_panup +Axis2Plus=+am_pandown +Axis1Minus=+am_panleft +Axis1Plus=+am_panright diff --git a/packages/games/emulators/raze/package.mk b/packages/games/emulators/raze/package.mk index db5037b95..32d3095b4 100644 --- a/packages/games/emulators/raze/package.mk +++ b/packages/games/emulators/raze/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2022-present Fewtarius PKG_NAME="raze" -PKG_VERSION="85fd984fb9fa7dc5d724b5fca803875c7d26b158" +PKG_VERSION="a071479" PKG_LICENSE="GPL" -PKG_SITE="https://github.com/JustEnoughLinuxOS/Raze" +PKG_SITE="https://github.com/coelckers/Raze" PKG_URL="${PKG_SITE}.git" PKG_DEPENDS_TARGET="toolchain SDL2 raze:host zmusic libvpx" PKG_SHORTDESC="Raze is a fork of Build engine games backed by GZDoom tech and combines Duke Nukem 3D, Blood, Redneck Rampage, Shadow Warrior and Exhumed/Powerslave in a single package." diff --git a/packages/games/emulators/raze/patches/001-fixes.patch b/packages/games/emulators/raze/patches/001-fixes.patch new file mode 100644 index 000000000..3a11c42a8 --- /dev/null +++ b/packages/games/emulators/raze/patches/001-fixes.patch @@ -0,0 +1,110 @@ +diff --git a/source/common/rendering/gles/gles_system.cpp b/source/common/rendering/gles/gles_system.cpp +index 51f8ee6a2..24904a7b0 100644 +--- a/source/common/rendering/gles/gles_system.cpp ++++ b/source/common/rendering/gles/gles_system.cpp +@@ -10,7 +10,7 @@ CVAR(Bool, gles_force_glsl_v100, false, 0); + CVAR(Int, gles_max_lights_per_surface, 32, 0); + EXTERN_CVAR(Bool, gl_customshader); + +- ++#define __ANDROID__ + #if USE_GLES2 + + PFNGLMAPBUFFERRANGEEXTPROC glMapBufferRange = NULL; +@@ -182,6 +182,7 @@ namespace OpenGLESRenderer + #if USE_GLES2 + gles.depthStencilAvailable = CheckExtension("GL_OES_packed_depth_stencil"); + gles.npotAvailable = CheckExtension("GL_OES_texture_npot"); ++ gles.useMappedBuffers = true; + gles.depthClampAvailable = CheckExtension("GL_EXT_depth_clamp"); + #else + gles.depthStencilAvailable = true; +diff --git a/source/common/rendering/gles/gles_system.h b/source/common/rendering/gles/gles_system.h +index d7f6ed139..a43e4e52f 100644 +--- a/source/common/rendering/gles/gles_system.h ++++ b/source/common/rendering/gles/gles_system.h +@@ -23,7 +23,7 @@ + #include + #include + +-#define USE_GLES2 0 ++#define USE_GLES2 1 + + #if (USE_GLES2) + #include "glad/glad.h" +diff --git a/source/games/duke/src/game_misc.cpp b/source/games/duke/src/game_misc.cpp +index c0a1fa0c2..1ec1bfbdf 100644 +--- a/source/games/duke/src/game_misc.cpp ++++ b/source/games/duke/src/game_misc.cpp +@@ -239,8 +239,6 @@ void drawoverlays(double smoothratio) + int cposx, cposy, cang; + + pp = &ps[screenpeek]; +- // set palette here, in case the 3D view is off. +- setgamepalette(setpal(pp)); + + float blend[4] = {}; + +diff --git a/wadsrc/static/language.def b/wadsrc/static/language.def +new file mode 100644 +index 000000000..210cdfb4e +--- /dev/null ++++ b/wadsrc/static/language.def +@@ -0,0 +1,4 @@ ++[default] ++ ++// Engine strings ++CNTRLMNU_OPEN_MAIN = "Open Main Menu"; +diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt +index 964fdbcac..f4a39981c 100644 +--- a/wadsrc/static/menudef.txt ++++ b/wadsrc/static/menudef.txt +@@ -737,6 +737,7 @@ OptionMenu "OtherControlsMenu" protected + Control "$CNTRLMNU_ADJUST_GAMMA" , "bumpgamma" + + StaticText "" ++ Control "$CNTRLMNU_OPEN_MAIN" , "menu_main" + ifnotgame(Exhumed) + { + Control "$CNTRLMNU_OPEN_HELP" , "openhelpmenu" +@@ -1694,33 +1695,14 @@ OptionMenu CustomResolutionMenu protected + + StaticText "$VIDMNU_RESPRESETHEAD" + StaticText "" +- StaticText "$VIDMNU_ASPECT43" ++ Command "320x240", "menu_resolution_set_custom 320 240" ++ Command "360x240", "menu_resolution_set_custom 360 240" ++ Command "400x300", "menu_resolution_set_custom 400 300" ++ Command "450x300", "menu_resolution_set_custom 450 300" ++ Command "480x320", "menu_resolution_set_custom 480 320" ++ Command "480x360", "menu_resolution_set_custom 480 360" ++ Command "512x384", "menu_resolution_set_custom 512 384" + Command "640x480", "menu_resolution_set_custom 640 480" +- Command "1024x768", "menu_resolution_set_custom 1024 768" +- Command "1280x960", "menu_resolution_set_custom 1280 960" +- Command "1600x1200", "menu_resolution_set_custom 1600 1200" +- StaticText "" +- StaticText "$VIDMNU_ASPECT54" +- Command "1280x1024", "menu_resolution_set_custom 1280 1024" +- StaticText "" +- StaticText "$VIDMNU_ASPECT169" +- Command "960x540", "menu_resolution_set_custom 960 540" +- Command "(720p HD) 1280x720", "menu_resolution_set_custom 1280 720" +- Command "1366x768", "menu_resolution_set_custom 1366 768" +- Command "(1080p HD) 1920x1080", "menu_resolution_set_custom 1920 1080" +- Command "(1440p HD) 2560x1440", "menu_resolution_set_custom 2560 1440" +- Command "(4K UHD) 3840x2160", "menu_resolution_set_custom 3840 2160" +- StaticText "" +- StaticText "$VIDMNU_ASPECT1610" +- Command "960x600", "menu_resolution_set_custom 960 600" +- Command "1280x800", "menu_resolution_set_custom 1280 800" +- Command "1440x900", "menu_resolution_set_custom 1440 900" +- Command "1680x1050", "menu_resolution_set_custom 1680 1050" +- Command "1920x1200", "menu_resolution_set_custom 1920 1200" +- StaticText "" +- StaticText "$VIDMNU_ASPECT219" +- Command "1920x810", "menu_resolution_set_custom 1920 810" +- Command "2560x1080", "menu_resolution_set_custom 2560 1080" + } + + diff --git a/packages/ui/emulationstation/config/es_settings.cfg b/packages/ui/emulationstation/config/es_settings.cfg index 21aa0a3c6..d0a253cac 100644 --- a/packages/ui/emulationstation/config/es_settings.cfg +++ b/packages/ui/emulationstation/config/es_settings.cfg @@ -15,7 +15,7 @@ - +