Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ScummVM: adding support for command_args and adding game Maniac Mansion #1002

Merged
merged 3 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions engines/scummvm/assets/run-scummvm.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion engines/scummvm/env.sh
Original file line number Diff line number Diff line change
@@ -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"
25 changes: 25 additions & 0 deletions metadata/packagessniper_v2.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down