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

fix #2453; MOTD for lobby (to be fetched from file); different motd for each mod

Browse Source
This commit is contained in:
Igor Popov
2013-01-07 14:46:38 +04:00
committed by Chris Forbes
parent d0aea18b3e
commit 68130c85f3
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/GameRules/Settings.cs
View File

@@ -36,7 +36,6 @@ namespace OpenRA.GameRules
public int TimeOut = 0; public int TimeOut = 0;
public bool Dedicated = false; public bool Dedicated = false;
public bool DedicatedLoop = true; public bool DedicatedLoop = true;
public string DedicatedMOTD = null;
public ServerSettings() { } public ServerSettings() { }
@@ -54,7 +53,6 @@ namespace OpenRA.GameRules
TimeOut = other.TimeOut; TimeOut = other.TimeOut;
Dedicated = other.Dedicated; Dedicated = other.Dedicated;
DedicatedLoop = other.DedicatedLoop; DedicatedLoop = other.DedicatedLoop;
DedicatedMOTD = other.DedicatedMOTD;
} }
} }

1
OpenRA.Game/Network/Session.cs
View File

@@ -78,7 +78,6 @@ namespace OpenRA.Network
public bool LockTeams = true; // don't allow team changes after game start. public bool LockTeams = true; // don't allow team changes after game start.
public bool AllowCheats = false; public bool AllowCheats = false;
public bool Dedicated; public bool Dedicated;
public string DedicatedMOTD;
} }
public Session(string[] mods) public Session(string[] mods)

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

@@ -119,7 +119,6 @@ namespace OpenRA.Server
lobbyInfo.GlobalSettings.ServerName = settings.Name; lobbyInfo.GlobalSettings.ServerName = settings.Name;
lobbyInfo.GlobalSettings.Ban = settings.Ban; lobbyInfo.GlobalSettings.Ban = settings.Ban;
lobbyInfo.GlobalSettings.Dedicated = settings.Dedicated; lobbyInfo.GlobalSettings.Dedicated = settings.Dedicated;
lobbyInfo.GlobalSettings.DedicatedMOTD = settings.DedicatedMOTD;
foreach (var t in ServerTraits.WithInterface<INotifyServerStart>()) foreach (var t in ServerTraits.WithInterface<INotifyServerStart>())
t.ServerStarted(this); t.ServerStarted(this);
@@ -328,11 +327,15 @@ namespace OpenRA.Server
SyncLobbyInfo(); SyncLobbyInfo();
SendChat(newConn, "has joined the game."); SendChat(newConn, "has joined the game.");
if ( File.Exists("{0}motd_{1}.txt".F(Platform.SupportDir, lobbyInfo.GlobalSettings.Mods[0])) )
{
var motd = System.IO.File.ReadAllText("{0}motd_{1}.txt".F(Platform.SupportDir, lobbyInfo.GlobalSettings.Mods[0]));
SendChatTo(newConn, motd);
}
if ( lobbyInfo.GlobalSettings.Dedicated ) if ( lobbyInfo.GlobalSettings.Dedicated )
{ {
if (lobbyInfo.GlobalSettings.DedicatedMOTD != null)
SendChatTo(newConn, lobbyInfo.GlobalSettings.DedicatedMOTD);
if (client.IsAdmin) if (client.IsAdmin)
SendChatTo(newConn, " You are admin now!"); SendChatTo(newConn, " You are admin now!");
else else