From 702127b8dff9b9f021d8834c5d04ce721a67edc3 Mon Sep 17 00:00:00 2001 From: bb Date: Sat, 16 Mar 2019 14:20:28 +0000 Subject: [PATCH] Add autostart conquest default description to readme.txt and add endless support for autostart in both readme.txt and GameSetup.cpp Reported By: elexis Fixes: 6d54ab4c1f, 22903b09a6 This was SVN commit r22112. --- binaries/system/readme.txt | 2 +- source/ps/GameSetup/GameSetup.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/binaries/system/readme.txt b/binaries/system/readme.txt index d2a41d4e99..28289db73b 100644 --- a/binaries/system/readme.txt +++ b/binaries/system/readme.txt @@ -17,7 +17,7 @@ Autostart: -autostart-team=PLAYER:TEAM sets the team for PLAYER (e.g. 2:2). -autostart-ceasefire=NUM sets a ceasefire duration NUM (default 0 minutes) -autostart-nonvisual disable any graphics and sounds --autostart-victory=SCRIPTNAME sets the victory conditions with SCRIPTNAME located in simulation/data/settings/victory_conditions/ +-autostart-victory=SCRIPTNAME sets the victory conditions with SCRIPTNAME located in simulation/data/settings/victory_conditions/ (default conquest). When the first given SCRIPTNAME is "endless", no victory conditions will apply. -autostart-wonderduration=NUM sets the victory duration NUM for wonder victory condition (default 10 minutes) -autostart-relicduration=NUM sets the victory duration NUM for relic victory condition (default 10 minutes) -autostart-reliccount=NUM sets the number of relics for relic victory condition (default 2 relics) diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp index 83a25fac48..3d9f2450d3 100644 --- a/source/ps/GameSetup/GameSetup.cpp +++ b/source/ps/GameSetup/GameSetup.cpp @@ -1199,7 +1199,8 @@ CStr8 LoadSettingsOfScenarioMap(const VfsPath &mapPath) * -autostart-nonvisual disable any graphics and sounds * -autostart-victory=SCRIPTNAME sets the victory conditions with SCRIPTNAME * located in simulation/data/settings/victory_conditions/ - * (default conquest) + * (default conquest). When the first given SCRIPTNAME is + * "endless", no victory conditions will apply. * -autostart-wonderduration=NUM sets the victory duration NUM for wonder victory condition * (default 10 minutes) * -autostart-relicduration=NUM sets the victory duration NUM for relic victory condition