Skip to content

Commit

Permalink
Fixes and cleanups
Browse files Browse the repository at this point in the history
Fixed the overriding issue by setting the first value of RESHADEVERSIONS to RSVERSOVRD and removing the RSVERS in the command to make the dropdown
  • Loading branch information
zany130 committed Nov 10, 2022
1 parent 6b329ee commit a3a557e
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions steamtinkerlaunch
Original file line number Diff line number Diff line change
Expand Up @@ -4951,7 +4951,7 @@ function AllSettingsEntriesDummyFunction {
--field=" $GUI_RS_64!$DESC_RS_64 ('RS_64')" "${RS_64/#-/ -}" `#CAT_Shader` `#SUB_ReShade` `#MENU_GLOBAL` \
--field=" $GUI_D3D47_32!$DESC_D3D47_32 ('D3D47_32')" "${D3D47_32/#-/ -}" `#CAT_Shader` `#SUB_ReShade` `#MENU_GLOBAL` \
--field=" $GUI_D3D47_64!$DESC_D3D47_64 ('D3D47_64')" "${D3D47_64/#-/ -}" `#CAT_Shader` `#SUB_ReShade` `#MENU_GLOBAL` \
--field=" $GUI_RESHADEOVERRIDE!$DESC_RESHADEOVERRIDE ('RSVERSOVRD')":CBE "$(cleanDropDown "${RSVERS/#-/ -}" "$RESHADEVERSIONS")" `#CAT_Shader` `#SUB_ReShade` `#MENU_GAME` \
--field=" $GUI_RESHADEOVERRIDE!$DESC_RESHADEOVERRIDE ('RSVERSOVRD')":CBE "$(cleanDropDown "$RESHADEVERSIONS")" `#CAT_Shader` `#SUB_ReShade` `#MENU_GAME` \
--field=" $GUI_ARCHALTEXE!$DESC_ARCHALTEXE ('ARCHALTEXE')":FL "${ARCHALTEXE/#-/ -}" `#CAT_Shader` `#SUB_ReShade` `#MENU_GAME` \
--field=" $GUI_ALTEXEPATH!$DESC_ALTEXEPATH ('ALTEXEPATH')":DIR "${ALTEXEPATH/#-/ -}" `#CAT_Shader` `#SUB_Directories` `#MENU_GAME` \
--field=" $GUI_RESHADESRCDIR!$DESC_RESHADESRCDIR ('RESHADESRCDIR')":DIR "${RESHADESRCDIR/#-/ -}" `#CAT_Shader` `#SUB_ReShade` `#SUB_Directories` `#MENU_GLOBAL` \
Expand Down Expand Up @@ -7433,7 +7433,7 @@ function installd3d47dll {
}

function createDLReShadeList {
RESHADEVERSIONS="5.0.0!4.9.1!3.4.1" # List some hardcoded reshade versions to selct for the override
RESHADEVERSIONS="$RSVERSOVRD!$RSVERS!5.0.0!4.9.1!3.4.1" # List some hardcoded reshade versions to selct for the override
#TODO replace with a auto poplating list based on the last few releses
}

Expand All @@ -7459,12 +7459,6 @@ function dlReShade {

dlCheck "$RSSETUP" "$DLDST" "X" "Downloading $RSSU"

#No longer needed?
#if [ ! -f "$DLDSTV" ]; then
# writelog "INFO" "${FUNCNAME[0]} - Creating backup '${RSSU}_${DLVERS}.exe'"
# cp "$DLDST" "$DLDSTV"
#fi

echo "$DLVERS" > "${DLDST//.exe/.log}"

if [ ! -s "$DLDST" ]; then
Expand All @@ -7479,10 +7473,10 @@ function dlReShade {
function overrideReShadeVersion
{
if ! [ "$RSVERSOVRD" -eq "$RSVERS" ]; then
writelog "INFO" "Overriding ReShade version - Set to '$RSVERSOVRD'"
writelog "INFO" ${FUNCNAME[0]} - "Overriding ReShade version - Set to '$RSVERSOVRD'"
RSVERS="$RSVERSOVRD"
else
writelog "SKIP" "RSVERSOVRD is set to '$RSVERSOVRD' continue with reshade version - '$RSVERS'"
writelog "SKIP" ${FUNCNAME[0]} - "RSVERSOVRD is set to '$RSVERSOVRD' continue with reshade version - '$RSVERS'"
fi
}

Expand Down

0 comments on commit a3a557e

Please sign in to comment.