mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 01:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup 6ab5483550 - handle unset values correctly

Browse Source
This commit is contained in:
Lancelot de Ferrière
2024-12-31 11:24:44 +01:00
committed by wraitii
parent 9f023825e0
commit e5c2193313
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/autostart/autostart_client.js
+1 -1
View File
@@ -8,7 +8,7 @@ class AutoStartClient
{
const playerName = cmdLineArgs['autostart-playername'] || "anonymous";
const ip = cmdLineArgs['autostart-client'] ?? "127.0.0.1";
const port = +cmdLineArgs?.['autostart-port'] ?? 5073;
const port = +(cmdLineArgs['autostart-port'] ?? 5073);
Engine.StartNetworkJoin(playerName, ip, port, !('autostart-disable-replay' in cmdLineArgs));
}
catch (e)
binaries/data/mods/public/autostart/autostart_host.js
+2 -2
View File
@@ -5,13 +5,13 @@ class AutoStartHost
this.launched = false;
this.playerAssignments = {};
this.maxPlayers = cmdLineArgs['autostart-host-players'] ?? 2;
this.maxPlayers = +(cmdLineArgs['autostart-host-players'] ?? 2);
this.cmdLineArgs = cmdLineArgs;
try
{
const playerName = cmdLineArgs['autostart-playername'] || "anonymous";
const port = +cmdLineArgs?.['autostart-port'] ?? 5073;
const port = +(cmdLineArgs['autostart-port'] ?? 5073);
// Stun and password not implemented for autostart.
Engine.StartNetworkHost(playerName, port, false, "", !('autostart-disable-replay' in cmdLineArgs));
binaries/data/mods/public/autostart/cmd_line_args.js
+6 -6
View File
@@ -68,10 +68,10 @@ function parseCmdLineArgs(settings, cmdLineArgs)
"skirmishes": "skirmish",
}[mapType]);
settings.map.selectMap("maps/" + cmdLineArgs['autostart']);
settings.mapSize.setSize(+cmdLineArgs['autostart-size'] || 192);
settings.mapSize.setSize(+(cmdLineArgs['autostart-size'] ?? 192));
settings.biome.setBiome(cmdLineArgs['autostart-biome'] || "random");
settings.playerCount.setNb(+cmdLineArgs['autostart-players'] || 2);
settings.playerCount.setNb(+(cmdLineArgs['autostart-players'] ?? 2));
const getPlayer = (key, i) => {
if (!(('autostart-' + key) in cmdLineArgs))
@@ -103,11 +103,11 @@ function parseCmdLineArgs(settings, cmdLineArgs)
}
// Seeds default to random so we only need to set specific values.
if (cmdLineArgs?.['autostart-seed'] != -1)
settings.seeds.seed = +cmdLineArgs?.['autostart-seed'] || 0;
if (cmdLineArgs['autostart-seed'] != -1)
settings.seeds.seed = +(cmdLineArgs['autostart-seed'] ?? 0);
if (cmdLineArgs?.['autostart-aiseed'] != -1)
settings.seeds.AIseed = +cmdLineArgs?.['autostart-aiseed'] || 0;
if (cmdLineArgs['autostart-aiseed'] != -1)
settings.seeds.AIseed = +(cmdLineArgs['autostart-aiseed'] ?? 0);
if (cmdLineArgs['autostart-ceasefire'])
settings.seeds.ceaserfire.setValue(+cmdLineArgs['autostart-ceasefire']);