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

Remove Password and Endpoint from OrderManager

Browse Source
This commit is contained in:
teinarss
2021-04-19 19:19:47 +02:00
committed by reaperrr
parent da4bf7f191
commit a1b3450b47
8 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Game/Game.cs
View File

@@ -66,8 +66,14 @@ namespace OpenRA
if (recordReplay)
connection.StartRecording(() => { return TimestampedFilename(); });
var om = new OrderManager(endpoint, password, connection);
var om = new OrderManager(connection);
JoinInner(om);
CurrentServerSettings.Password = password;
CurrentServerSettings.Target = endpoint;
lastConnectionState = ConnectionState.PreConnecting;
ConnectionStateChanged(OrderManager, password, connection);
return om;
}
@@ -81,18 +87,16 @@ namespace OpenRA
{
OrderManager?.Dispose();
OrderManager = om;
lastConnectionState = ConnectionState.PreConnecting;
ConnectionStateChanged(OrderManager);
}
public static void JoinReplay(string replayFile)
{
JoinInner(new OrderManager(new ConnectionTarget(), "", new ReplayConnection(replayFile)));
JoinInner(new OrderManager(new ReplayConnection(replayFile)));
}
static void JoinLocal()
{
JoinInner(new OrderManager(new ConnectionTarget(), "", new EchoConnection()));
JoinInner(new OrderManager(new EchoConnection()));
}
// More accurate replacement for Environment.TickCount
@@ -104,7 +108,7 @@ namespace OpenRA
public static int LocalTick => OrderManager.LocalFrameNumber;
public static event Action<ConnectionTarget> OnRemoteDirectConnect = _ => { };
public static event Action<OrderManager> ConnectionStateChanged = _ => { };
public static event Action<OrderManager, string, NetworkConnection> ConnectionStateChanged = (om, pass, conn) => { };
static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
public static int LocalClientId => OrderManager.Connection.LocalClientId;
@@ -415,7 +419,7 @@ namespace OpenRA
{
// Clear static state if we have switched mods
LobbyInfoChanged = () => { };
ConnectionStateChanged = om => { };
ConnectionStateChanged = (om, p, conn) => { };
BeforeGameStart = () => { };
OnRemoteDirectConnect = endpoint => { };
delayedActions = new ActionQueue();
@@ -652,7 +656,7 @@ namespace OpenRA
if (OrderManager.Connection.ConnectionState != lastConnectionState)
{
lastConnectionState = OrderManager.Connection.ConnectionState;
ConnectionStateChanged(OrderManager);
ConnectionStateChanged(OrderManager, null, null);
}
InnerLogicTick(OrderManager);
@@ -997,4 +1001,10 @@ namespace OpenRA
}
}
}
public static class CurrentServerSettings
{
public static string Password;
public static ConnectionTarget Target;
}
}