fixing up various issues
This commit is contained in:
@@ -30,6 +30,10 @@ namespace OpenRA.Server
|
|||||||
lobbyInfo = new Session();
|
lobbyInfo = new Session();
|
||||||
lobbyInfo.GlobalSettings.Mods = defaultMods;
|
lobbyInfo.GlobalSettings.Mods = defaultMods;
|
||||||
|
|
||||||
|
Console.WriteLine("Initial mods: ");
|
||||||
|
foreach( var m in lobbyInfo.GlobalSettings.Mods )
|
||||||
|
Console.WriteLine("- {0}", m);
|
||||||
|
|
||||||
listener.Start();
|
listener.Start();
|
||||||
|
|
||||||
Console.WriteLine("Server started.");
|
Console.WriteLine("Server started.");
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ namespace OpenRa
|
|||||||
|
|
||||||
internal static void Initialize(string mapName, Renderer renderer, int2 clientSize, int localPlayer, Controller controller)
|
internal static void Initialize(string mapName, Renderer renderer, int2 clientSize, int localPlayer, Controller controller)
|
||||||
{
|
{
|
||||||
|
|
||||||
Game.renderer = renderer;
|
Game.renderer = renderer;
|
||||||
Game.clientSize = clientSize;
|
Game.clientSize = clientSize;
|
||||||
|
|
||||||
@@ -189,6 +190,8 @@ namespace OpenRa
|
|||||||
public static void SyncLobbyInfo(string data)
|
public static void SyncLobbyInfo(string data)
|
||||||
{
|
{
|
||||||
var session = new Session();
|
var session = new Session();
|
||||||
|
session.GlobalSettings.Mods = Settings.InitialMods;
|
||||||
|
|
||||||
var ys = MiniYaml.FromString(data);
|
var ys = MiniYaml.FromString(data);
|
||||||
foreach (var y in ys)
|
foreach (var y in ys)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -26,10 +26,10 @@ namespace OpenRa.GameRules
|
|||||||
public readonly int Player = 1;
|
public readonly int Player = 1;
|
||||||
public readonly string Replay = "";
|
public readonly string Replay = "";
|
||||||
public readonly string PlayerName = "";
|
public readonly string PlayerName = "";
|
||||||
|
public readonly string[] InitialMods = { "ra" };
|
||||||
|
|
||||||
// Gameplay options
|
// Gameplay options
|
||||||
public readonly bool RepairRequiresConyard = true;
|
public readonly bool RepairRequiresConyard = true;
|
||||||
public readonly bool PowerDownBuildings = true;
|
public readonly bool PowerDownBuildings = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,9 @@ namespace OpenRa
|
|||||||
Directory.SetCurrentDirectory("..");
|
Directory.SetCurrentDirectory("..");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
LoadUserSettings(settings);
|
LoadUserSettings(settings);
|
||||||
|
Game.LobbyInfo.GlobalSettings.Mods = Game.Settings.InitialMods;
|
||||||
|
|
||||||
// Load the default mod to access required files
|
// Load the default mod to access required files
|
||||||
Game.LoadModPackages(new Manifest(Game.LobbyInfo.GlobalSettings.Mods));
|
Game.LoadModPackages(new Manifest(Game.LobbyInfo.GlobalSettings.Mods));
|
||||||
|
|||||||
@@ -10,9 +10,8 @@ Packages:
|
|||||||
mods/cnc/packages/conquer.mix
|
mods/cnc/packages/conquer.mix
|
||||||
mods/cnc/packages/general.mix
|
mods/cnc/packages/general.mix
|
||||||
mods/cnc/packages/sounds.mix
|
mods/cnc/packages/sounds.mix
|
||||||
mods/cnc/packages/transit.mix
|
|
||||||
mods/cnc/packages/tempicnh.mix
|
mods/cnc/packages/tempicnh.mix
|
||||||
main.mix
|
~main.mix
|
||||||
redalert.mix
|
redalert.mix
|
||||||
hires.mix
|
hires.mix
|
||||||
local.mix
|
local.mix
|
||||||
|
|||||||
BIN
mods/cnc/temperat_ra.pal
Normal file
BIN
mods/cnc/temperat_ra.pal
Normal file
Binary file not shown.
5
settings-netplay-cnc.ini
Normal file
5
settings-netplay-cnc.ini
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
[Settings]
|
||||||
|
NetworkHost=localhost
|
||||||
|
NetworkPort=1234
|
||||||
|
UseAftermath=yes
|
||||||
|
InitialMods=cnc
|
||||||
Reference in New Issue
Block a user