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

Set a relicCount from autostart, so the triggerscripts actually will spawn relics

Browse Source 
Should fix the concern in 6d54ab4c1f
Reported By: mimo
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1393
This was SVN commit r21560.
This commit is contained in:
bb 2018-03-15 23:46:29 +00:00
parent c5d9ea7c06
commit 648cd44576
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binaries/system/readme.txt
View File

@ -16,8 +16,9 @@ Autostart:
-autostart-team=PLAYER:TEAM sets the team for PLAYER (e.g. 2:2).
-autostart-nonvisual disable any graphics and sounds
-autostart-victory=SCRIPTNAME sets the victory conditions with SCRIPTNAME located in simulation/data/settings/victory_conditions/
-autostart-wonderduration=NUM sets the victory duration NUM for wonder victory conditions (default 10 minutes)
-autostart-relicduration=NUM sets the victory duration NUM for relic victory conditions (default 10 minutes)
-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)
Multiplayer:
-autostart-playername=NAME sets local player NAME (default 'anonymous')
-autostart-host sets multiplayer host mode

11
source/ps/GameSetup/GameSetup.cpp
View File

@ -1156,10 +1156,12 @@ CStr8 LoadSettingsOfScenarioMap(const VfsPath &mapPath)
* -autostart-victory=SCRIPTNAME sets the victory conditions with SCRIPTNAME
* located in simulation/data/settings/victory_conditions/
* (default conquest)
* -autostart-wonderduration=NUM sets the victory duration NUM for wonder victory conditions
* -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 conditions
* -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)
*
* Multiplayer:
* -autostart-playername=NAME sets local player NAME (default 'anonymous')
@ -1508,6 +1510,11 @@ bool Autostart(const CmdLineArgs& args)
relicDuration = args.Get("autostart-relicduration").ToInt();
scriptInterface.SetProperty(settings, "RelicDuration", relicDuration);
int relicCount = 2;
if (args.Has("autostart-reliccount"))
relicCount = args.Get("autostart-reliccount").ToInt();
scriptInterface.SetProperty(settings, "RelicCount", relicCount);
if (args.Has("autostart-host"))
{
InitPs(true, L"page_loading.xml", &scriptInterface, mpInitData);