gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Fix the autostart victoryDuration support, which was broken by 63ca7ad672

Browse Source 
Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D1285
This was SVN commit r21122.
This commit is contained in:
bb
2018-02-06 19:44:05 +00:00
parent e43ed4016c
commit 6b88ca6a11
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/GameSetup/GameSetup.cpp
+13 -3
View File
@@ -1156,7 +1156,10 @@ CStr8 LoadSettingsOfScenarioMap(const VfsPath &mapPath)
* -autostart-victory=SCRIPTNAME sets the victory conditions with SCRIPTNAME * -autostart-victory=SCRIPTNAME sets the victory conditions with SCRIPTNAME
* located in simulation/data/settings/victory_conditions/ * located in simulation/data/settings/victory_conditions/
* (default conquest) * (default conquest)
* -autostart-victoryduration=NUM sets the victory duration NUM for specific 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)
* *
* Multiplayer: * Multiplayer:
* -autostart-playername=NAME sets local player NAME (default 'anonymous') * -autostart-playername=NAME sets local player NAME (default 'anonymous')
@@ -1482,8 +1485,15 @@ bool Autostart(const CmdLineArgs& args)
ToJSVal_vector(cx, &triggerScripts, triggerScriptsVector); ToJSVal_vector(cx, &triggerScripts, triggerScriptsVector);
scriptInterface.SetProperty(settings, "TriggerScripts", triggerScripts); scriptInterface.SetProperty(settings, "TriggerScripts", triggerScripts);
if (args.Has("autostart-victoryduration")) int wonderDuration = 10;
scriptInterface.SetProperty(settings, "VictoryDuration", args.Get("autostart-victoryduration").ToInt()); if (args.Has("autostart-wonderduration"))
wonderDuration = args.Get("autostart-wonderduration").ToInt();
scriptInterface.SetProperty(settings, "WonderDuration", wonderDuration);
int relicDuration = 10;
if (args.Has("autostart-relicduration"))
relicDuration = args.Get("autostart-relicduration").ToInt();
scriptInterface.SetProperty(settings, "RelicDuration", relicDuration);
if (args.Has("autostart-host")) if (args.Has("autostart-host"))
{ {