From 533fb6f7bceb09c1ab22830a1416e28c3327df87 Mon Sep 17 00:00:00 2001
From: leper <leper@wildfiregames.com>
Date: Wed, 24 Sep 2014 17:49:22 +0000
Subject: [PATCH] Load the public mod by default. Fixes #2754.

This was SVN commit r15796.
---
 binaries/data/config/default.cfg |  2 +-
 build/resources/0ad.sh           |  2 +-
 source/tools/dist/0ad.nsi        | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg
index 7ebbff3039..7c45597b8f 100644
--- a/binaries/data/config/default.cfg
+++ b/binaries/data/config/default.cfg
@@ -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
 
 ; MOD SETTINGS
-;mod.enabledmods = "mod public"
+mod.enabledmods = "mod public"
diff --git a/build/resources/0ad.sh b/build/resources/0ad.sh
index 63b14d9fc5..944f8c364f 100644
--- a/build/resources/0ad.sh
+++ b/build/resources/0ad.sh
@@ -2,7 +2,7 @@
 
 pyrogenesis=$(which pyrogenesis 2> /dev/null)
 if [ -x "$pyrogenesis" ] ; then
-  "$pyrogenesis" -mod=public "$@"
+  "$pyrogenesis" "$@"
 else
   echo "Error: pyrogenesis not found in ($PATH)"
   exit 1
diff --git a/source/tools/dist/0ad.nsi b/source/tools/dist/0ad.nsi
index 8279da0a7e..b03a2716c1 100644
--- a/source/tools/dist/0ad.nsi
+++ b/source/tools/dist/0ad.nsi
@@ -58,7 +58,6 @@
   !insertmacro MUI_PAGE_INSTFILES
 
   !define MUI_FINISHPAGE_RUN $INSTDIR\binaries\system\pyrogenesis.exe
-  !define MUI_FINISHPAGE_RUN_PARAMETERS "-mod=public"
   !insertmacro MUI_PAGE_FINISH
   
   !insertmacro MUI_UNPAGE_CONFIRM
@@ -78,10 +77,10 @@ Section "!Game and data files" GameSection
   File "${CHECKOUTPATH}\*.txt"
   File "${CHECKOUTPATH}\source\tools\openlogsfolder\*.*"
   !if INCLUDE_SOURCE
-    File /r /x "public" /x "dev.cfg" "${CHECKOUTPATH}\binaries"
+    File /r /x "public" /x "mod" /x "dev.cfg" "${CHECKOUTPATH}\binaries"
   !else
     ; 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
 
   SetOutPath "$INSTDIR\binaries\data\mods\public"
@@ -114,9 +113,8 @@ Section "!Game and data files" GameSection
   ;Create shortcuts
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
   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\Pyrogenesis mod selector.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" ""
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Map editor.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-mod=public -editor" "$INSTDIR\binaries\data\tools\atlas\icons\ScenarioEditor.ico"
+  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\0 A.D..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"
   SetOutPath "$INSTDIR"
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Open logs folder.lnk" "$INSTDIR\OpenLogsFolder.bat"
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"