sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Load the public mod by default. Fixes #2754.

Browse Source 
This was SVN commit r15796.
This commit is contained in:
leper 2014-09-24 17:49:22 +00:00
parent 4753a0c1c2
commit 533fb6f7bc
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/config/default.cfg
View File

@ -378,4 +378,4 @@ overlay.fps = "false" ; Show frames per second in top right
overlay.realtime = "false" ; Show current system time in top right corner overlay.realtime = "false" ; Show current system time in top right corner
; MOD SETTINGS ; MOD SETTINGS
;mod.enabledmods = "mod public" mod.enabledmods = "mod public"

2
build/resources/0ad.sh
View File

@ -2,7 +2,7 @@
pyrogenesis=$(which pyrogenesis 2> /dev/null) pyrogenesis=$(which pyrogenesis 2> /dev/null)
if [ -x "$pyrogenesis" ] ; then if [ -x "$pyrogenesis" ] ; then
"$pyrogenesis" -mod=public "$@" "$pyrogenesis" "$@"
else else
echo "Error: pyrogenesis not found in ($PATH)" echo "Error: pyrogenesis not found in ($PATH)"
exit 1 exit 1

10
source/tools/dist/0ad.nsi vendored
View File

@ -58,7 +58,6 @@
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
!define MUI_FINISHPAGE_RUN $INSTDIR\binaries\system\pyrogenesis.exe !define MUI_FINISHPAGE_RUN $INSTDIR\binaries\system\pyrogenesis.exe
!define MUI_FINISHPAGE_RUN_PARAMETERS "-mod=public"
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_CONFIRM
@ -78,10 +77,10 @@ Section "!Game and data files" GameSection
File "${CHECKOUTPATH}\*.txt" File "${CHECKOUTPATH}\*.txt"
File "${CHECKOUTPATH}\source\tools\openlogsfolder\*.*" File "${CHECKOUTPATH}\source\tools\openlogsfolder\*.*"
!if INCLUDE_SOURCE !if INCLUDE_SOURCE
File /r /x "public" /x "dev.cfg" "${CHECKOUTPATH}\binaries" File /r /x "public" /x "mod" /x "dev.cfg" "${CHECKOUTPATH}\binaries"
!else !else
; Exclude debug DLLs and related files ; Exclude debug DLLs and related files
File /r /x "public" /x "dev.cfg" /x "*_d.dll" /x "*_dbg.dll.*" /x "*_dbg.exe.*" /x "enetd.dll" /x "FColladaD.dll" /x "gloox-1.0d.dll" /x "glooxwrapper_dbg.*" /x "jpeg-6bd.dll" /x "libcurld.dll" /x "libpng16d.dll" /x "miniupnpcd.dll" /x "mozjs24-ps-debug.*" /x "msvc*d.dll" /x "zlib1d.dll" "${CHECKOUTPATH}\binaries" File /r /x "public" /x "mod" /x "dev.cfg" /x "*_d.dll" /x "*_dbg.dll.*" /x "*_dbg.exe.*" /x "enetd.dll" /x "FColladaD.dll" /x "gloox-1.0d.dll" /x "glooxwrapper_dbg.*" /x "jpeg-6bd.dll" /x "libcurld.dll" /x "libpng16d.dll" /x "miniupnpcd.dll" /x "mozjs24-ps-debug.*" /x "msvc*d.dll" /x "zlib1d.dll" "${CHECKOUTPATH}\binaries"
!endif !endif
SetOutPath "$INSTDIR\binaries\data\mods\public" SetOutPath "$INSTDIR\binaries\data\mods\public"
@ -114,9 +113,8 @@ Section "!Game and data files" GameSection
;Create shortcuts ;Create shortcuts
CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
SetOutPath "$INSTDIR\binaries\system" ;Set working directory of shortcuts SetOutPath "$INSTDIR\binaries\system" ;Set working directory of shortcuts
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\0 A.D..lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-mod=public" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\0 A.D..lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" ""
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Pyrogenesis mod selector.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Map editor.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-editor" "$INSTDIR\binaries\data\tools\atlas\icons\ScenarioEditor.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Map editor.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-mod=public -editor" "$INSTDIR\binaries\data\tools\atlas\icons\ScenarioEditor.ico"
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Open logs folder.lnk" "$INSTDIR\OpenLogsFolder.bat" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Open logs folder.lnk" "$INSTDIR\OpenLogsFolder.bat"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"