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

Fix ingame ra <-> cnc transition.

Browse Source 
Mod syntax change to "/mods mod[ mod...] map"
This commit is contained in:
Paul Chote
2010-04-09 19:08:54 +12:00
parent a683bddfea
commit 5c978df9a4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -138,6 +138,8 @@ namespace OpenRA
Rules.LoadRules(manifest); Rules.LoadRules(manifest);
Timer.Time( "load rules: {0}" ); Timer.Time( "load rules: {0}" );
Game.packageChangePending = false; Game.packageChangePending = false;
LoadMap(manifest.ShellmapUid);
} }
public static void ChangeMap(string mapName) public static void ChangeMap(string mapName)

5
OpenRA.Game/Server/Server.cs
View File

@@ -467,8 +467,9 @@ namespace OpenRA.Server
SendChatTo( conn, "You can't change mods after the game has started" ); SendChatTo( conn, "You can't change mods after the game has started" );
return true; return true;
} }
var args = s.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).ToList();
lobbyInfo.GlobalSettings.Mods = s.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); lobbyInfo.GlobalSettings.Mods = args.GetRange(0,args.Count - 1).ToArray();
lobbyInfo.GlobalSettings.Map = args.Last();
SyncLobbyInfo(); SyncLobbyInfo();
return true; return true;
}}, }},