epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added map name support to Launch.Map command line parameter

Browse Source 
Fixed code based on feedback

Replaced try/catch block with a null check and exception throw

Fixed code based on feedback

Fixed code based on feedback

Simplified Launch.Map parameter to use map name directly
This commit is contained in:
GeorgeD64
2021-08-23 23:13:48 +10:00
committed by Matthias Mailänder
parent a537346580
commit e00efbf53d
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Game.cs
View File

@@ -953,12 +953,9 @@ namespace OpenRA
Order.Command($"state {Session.ClientState.Ready}") Order.Command($"state {Session.ClientState.Ready}")
}; };
var path = Platform.ResolvePath(launchMap); var map = ModData.MapCache.SingleOrDefault(m => m.Uid == launchMap || Path.GetFileName(m.Package.Name) == launchMap);
var map = ModData.MapCache.SingleOrDefault(m => m.Uid == launchMap) ??
ModData.MapCache.SingleOrDefault(m => m.Package.Name == path);
if (map == null) if (map == null)
throw new InvalidOperationException($"Could not find map '{launchMap}'."); throw new ArgumentException($"Could not find map '{launchMap}'.");
CreateAndStartLocalServer(map.Uid, orders); CreateAndStartLocalServer(map.Uid, orders);
} }