From 9b94163fea00d18ea700a942e5c40040f7c6c908 Mon Sep 17 00:00:00 2001 From: Jpxe Date: Mon, 18 Sep 2023 18:40:38 +0200 Subject: [PATCH 1/3] run-scummvm.sh: adding argument support --- engines/scummvm/assets/run-scummvm.sh | 32 ++++++++++++++------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/engines/scummvm/assets/run-scummvm.sh b/engines/scummvm/assets/run-scummvm.sh index 6fca76c01..ecc3c7ddb 100755 --- a/engines/scummvm/assets/run-scummvm.sh +++ b/engines/scummvm/assets/run-scummvm.sh @@ -1,26 +1,28 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +GAME="$1" +OPTIONS="$2" +INIPATH="scummvm.ini" + cd "$DIR" -if [ ! -f scummvm.ini ]; then - echo "No scummvm.ini file detected, so creating" - echo -e "[scummvm]" >> scummvm.ini - echo -e "gfx_mode=surfacesdl" >> scummvm.ini +if [ ! -f "$INIPATH" ]; then + echo "Creating $INIPATH" + echo -e "[scummvm]\ngfx_mode=surfacesdl" > "$INIPATH" fi if [[ -d "../Original" ]]; then - echo "Assuming original path for scummvm" - LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./bin/scummvm -c scummvm.ini --add --path=../Original --recursive + echo "Assuming original path for ScummVM" + PATH_ARG="--path=../Original" +elif [[ $DIR == *"ScummVM_Windows"* ]]; then + echo "Running parent path" + PATH_ARG="--path=../../" else - if [[ $DIR == *"ScummVM_Windows"* ]]; then - echo "Running parent path" - LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./bin/scummvm -c scummvm.ini --add --path=../../ --recursive - else - echo "Running normal path" - LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./bin/scummvm -c scummvm.ini --add --path=../ --recursive - fi - + echo "Running normal path" + PATH_ARG="--path=../" fi -LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./bin/scummvm -c scummvm.ini --fullscreen --themepath=./share/scummvm +LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./bin/scummvm -c "$INIPATH" --add --recursive $PATH_ARG + +LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./bin/scummvm -c "$INIPATH" --fullscreen --themepath=./share/scummvm $OPTIONS $GAME \ No newline at end of file From fc0cff3446cf0a42a3c28aa69aeb11d0578b6978 Mon Sep 17 00:00:00 2001 From: Jpxe Date: Mon, 18 Sep 2023 18:45:25 +0200 Subject: [PATCH 2/3] Adding Maniac Mansion --- engines/scummvm/env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/scummvm/env.sh b/engines/scummvm/env.sh index 402846de5..4fe4b8450 100755 --- a/engines/scummvm/env.sh +++ b/engines/scummvm/env.sh @@ -1,6 +1,6 @@ #!/bin/bash -export STEAM_APP_ID_LIST="255940 284050 1044340 1367160 1368340 6310 355170 255920 default" +export STEAM_APP_ID_LIST="255940 284050 1044340 1367160 1368340 6310 355170 255920 529890 default" export LICENSE_PATH="./source/COPYING" export ADDITIONAL_LICENSES="./source/COPYING ./source/COPYRIGHT" export COMMON_PACKAGE="1" From 6eb2ebcc32b4ca5656ea2c2b67bfd70c26c8e691 Mon Sep 17 00:00:00 2001 From: Jpxe Date: Mon, 18 Sep 2023 18:47:14 +0200 Subject: [PATCH 3/3] Adding Maniac Mansion --- metadata/packagessniper_v2.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/metadata/packagessniper_v2.json b/metadata/packagessniper_v2.json index 05c4187a5..22d5655df 100644 --- a/metadata/packagessniper_v2.json +++ b/metadata/packagessniper_v2.json @@ -3261,6 +3261,31 @@ "cloudNotAvailable": true, "app_id": "6310" }, + { + "game_name": "Maniac Mansion", + "download": [ + { + "name": "scummvm", + "url": "https://github.com/luxtorpeda-dev/packages/releases/download/scummvm-23/", + "file": "scummvm-common-23.tar.xz", + "cache_by_name": true + } + ], + "download_config": [ + { + "extract_location": "./scum", + "download_name": "scummvm" + } + ], + "command": "./scum/run-scummvm.sh", + "command_args": [ + "maniac-v2", + "--render-mode=amiga" + ], + "engine_name": "ScummVM", + "cloudNotAvailable": true, + "app_id": "529890" + }, { "game_name": "X-COM: Terror from the Deep", "download": [