diff --git a/launch-dedicated.cmd b/launch-dedicated.cmd index ec8441c..266be85 100644 --- a/launch-dedicated.cmd +++ b/launch-dedicated.cmd @@ -14,12 +14,8 @@ 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,./mods -set MOD_SEARCH_PATHS=%~dp0mods -if %INCLUDE_DEFAULT_MODS% neq "True" goto start -set MOD_SEARCH_PATHS=%MOD_SEARCH_PATHS%,./mods - -:start if not exist %ENGINE_DIRECTORY%\OpenRA.Game.exe goto noengine >nul find %ENGINE_VERSION% %ENGINE_DIRECTORY%\VERSION || goto noengine cd %ENGINE_DIRECTORY% diff --git a/launch-game.cmd b/launch-game.cmd index 58a27ad..0c5a765 100644 --- a/launch-game.cmd +++ b/launch-game.cmd @@ -2,13 +2,9 @@ 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 -if %INCLUDE_DEFAULT_MODS% neq "True" goto launch -set MOD_SEARCH_PATHS=%MOD_SEARCH_PATHS%,./mods +set MOD_SEARCH_PATHS=%~dp0mods,./mods -:launch set TEMPLATE_DIR=%CD% if not exist %ENGINE_DIRECTORY%\OpenRA.Game.exe goto noengine >nul find %ENGINE_VERSION% %ENGINE_DIRECTORY%\VERSION || goto noengine diff --git a/utility.cmd b/utility.cmd index 0b2339e..6c51b06 100644 --- a/utility.cmd +++ b/utility.cmd @@ -2,14 +2,10 @@ 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,./mods title OpenRA.Utility.exe %MOD_ID% -set MOD_SEARCH_PATHS=%~dp0mods -if %INCLUDE_DEFAULT_MODS% neq "True" goto start -set MOD_SEARCH_PATHS=%MOD_SEARCH_PATHS%,./mods - -:start set TEMPLATE_DIR=%CD% if not exist %ENGINE_DIRECTORY%\OpenRA.Game.exe goto noengine >nul find %ENGINE_VERSION% %ENGINE_DIRECTORY%\VERSION || goto noengine