diff --git a/OpenRA.Server/Server.cs b/OpenRA.Server/Server.cs index eb8ba243ec..9c7c9d678f 100644 --- a/OpenRA.Server/Server.cs +++ b/OpenRA.Server/Server.cs @@ -30,6 +30,10 @@ namespace OpenRA.Server lobbyInfo = new Session(); lobbyInfo.GlobalSettings.Mods = defaultMods; + Console.WriteLine("Initial mods: "); + foreach( var m in lobbyInfo.GlobalSettings.Mods ) + Console.WriteLine("- {0}", m); + listener.Start(); Console.WriteLine("Server started."); diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs index 0493ed03cf..df659350fe 100644 --- a/OpenRa.Game/Game.cs +++ b/OpenRa.Game/Game.cs @@ -103,6 +103,7 @@ namespace OpenRa internal static void Initialize(string mapName, Renderer renderer, int2 clientSize, int localPlayer, Controller controller) { + Game.renderer = renderer; Game.clientSize = clientSize; @@ -189,6 +190,8 @@ namespace OpenRa public static void SyncLobbyInfo(string data) { var session = new Session(); + session.GlobalSettings.Mods = Settings.InitialMods; + var ys = MiniYaml.FromString(data); foreach (var y in ys) { diff --git a/OpenRa.Game/GameRules/UserSettings.cs b/OpenRa.Game/GameRules/UserSettings.cs index 8f0957429f..0b1344bab1 100644 --- a/OpenRa.Game/GameRules/UserSettings.cs +++ b/OpenRa.Game/GameRules/UserSettings.cs @@ -26,10 +26,10 @@ namespace OpenRa.GameRules public readonly int Player = 1; public readonly string Replay = ""; public readonly string PlayerName = ""; + public readonly string[] InitialMods = { "ra" }; // Gameplay options public readonly bool RepairRequiresConyard = true; public readonly bool PowerDownBuildings = true; - } } diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs index d86b80700c..a91281d69b 100755 --- a/OpenRa.Game/MainWindow.cs +++ b/OpenRa.Game/MainWindow.cs @@ -48,7 +48,9 @@ namespace OpenRa Directory.SetCurrentDirectory(".."); } + LoadUserSettings(settings); + Game.LobbyInfo.GlobalSettings.Mods = Game.Settings.InitialMods; // Load the default mod to access required files Game.LoadModPackages(new Manifest(Game.LobbyInfo.GlobalSettings.Mods)); diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 6dc22cb34c..68d0bf27bd 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -10,9 +10,8 @@ Packages: mods/cnc/packages/conquer.mix mods/cnc/packages/general.mix mods/cnc/packages/sounds.mix - mods/cnc/packages/transit.mix mods/cnc/packages/tempicnh.mix - main.mix + ~main.mix redalert.mix hires.mix local.mix diff --git a/mods/cnc/temperat_ra.pal b/mods/cnc/temperat_ra.pal new file mode 100644 index 0000000000..bb63fcdd50 Binary files /dev/null and b/mods/cnc/temperat_ra.pal differ diff --git a/settings-netplay-cnc.ini b/settings-netplay-cnc.ini new file mode 100644 index 0000000000..33aca0eb41 --- /dev/null +++ b/settings-netplay-cnc.ini @@ -0,0 +1,5 @@ +[Settings] +NetworkHost=localhost +NetworkPort=1234 +UseAftermath=yes +InitialMods=cnc \ No newline at end of file