diff --git a/.gitignore b/.gitignore index da0e15d..ba19d57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +user.config engine bin obj diff --git a/launch-dedicated.cmd b/launch-dedicated.cmd index 1a5ef05..112881a 100644 --- a/launch-dedicated.cmd +++ b/launch-dedicated.cmd @@ -13,6 +13,7 @@ set Password="" title %Name% FOR /F "tokens=1,2 delims==" %%A IN (mod.config) DO (set %%A=%%B) +if exist user.config (FOR /F "tokens=1,2 delims==" %%A IN (user.config) DO (set %%A=%%B)) set MOD_SEARCH_PATHS=%~dp0mods if %INCLUDE_DEFAULT_MODS% neq "True" goto start diff --git a/launch-dedicated.sh b/launch-dedicated.sh index 781ab95..c82ff31 100755 --- a/launch-dedicated.sh +++ b/launch-dedicated.sh @@ -15,6 +15,11 @@ TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}") # shellcheck source=mod.config . "${TEMPLATE_ROOT}/mod.config" +if [ -f "${TEMPLATE_ROOT}/user.config" ]; then + # shellcheck source=user.config + . "${TEMPLATE_ROOT}/user.config" +fi + MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods" if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then MOD_SEARCH_PATHS="${TEMPLATE_PATHS},./mods" diff --git a/launch-game.cmd b/launch-game.cmd index 2b1aef0..fc9a013 100644 --- a/launch-game.cmd +++ b/launch-game.cmd @@ -1,6 +1,7 @@ @echo off title OpenRA FOR /F "tokens=1,2 delims==" %%A IN (mod.config) DO (set %%A=%%B) +if exist user.config (FOR /F "tokens=1,2 delims==" %%A IN (user.config) DO (set %%A=%%B)) set TEMPLATE_LAUNCHER=%0 set MOD_SEARCH_PATHS=%~dp0mods diff --git a/launch-game.sh b/launch-game.sh index 545808b..5f6beaa 100755 --- a/launch-game.sh +++ b/launch-game.sh @@ -11,6 +11,11 @@ TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}") # shellcheck source=mod.config . "${TEMPLATE_ROOT}/mod.config" +if [ -f "${TEMPLATE_ROOT}/user.config" ]; then + # shellcheck source=user.config + . "${TEMPLATE_ROOT}/user.config" +fi + MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods" if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then MOD_SEARCH_PATHS="${TEMPLATE_PATHS},./mods" diff --git a/utility.cmd b/utility.cmd index 69fbead..500e2e2 100644 --- a/utility.cmd +++ b/utility.cmd @@ -1,6 +1,7 @@ @echo off FOR /F "tokens=1,2 delims==" %%A IN (mod.config) DO (set %%A=%%B) +if exist user.config (FOR /F "tokens=1,2 delims==" %%A IN (user.config) DO (set %%A=%%B)) title OpenRA.Utility.exe %MOD_ID% diff --git a/utility.sh b/utility.sh index 84b0a88..dda6c10 100755 --- a/utility.sh +++ b/utility.sh @@ -14,6 +14,11 @@ TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}") # shellcheck source=mod.config . "${TEMPLATE_ROOT}/mod.config" +if [ -f "${TEMPLATE_ROOT}/user.config" ]; then + # shellcheck source=user.config + . "${TEMPLATE_ROOT}/user.config" +fi + MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods" if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then MOD_SEARCH_PATHS="${TEMPLATE_PATHS},./mods"