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

#289 lobby title should show servername -- fixed

Browse Source
This commit is contained in:
Chris Forbes
2010-10-13 20:45:03 +13:00
parent dca77956cb
commit 4afd8ad783
5 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,6 +62,7 @@ namespace OpenRA.Network
public class Global public class Global
{ {
public string ServerName;
public string Map; public string Map;
public string[] Mods = { "ra" }; // mod names public string[] Mods = { "ra" }; // mod names
public int OrderLatency = 3; public int OrderLatency = 3;

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

@@ -64,6 +64,7 @@ namespace OpenRA.Server
lobbyInfo.GlobalSettings.RandomSeed = randomSeed; lobbyInfo.GlobalSettings.RandomSeed = randomSeed;
lobbyInfo.GlobalSettings.Map = map; lobbyInfo.GlobalSettings.Map = map;
lobbyInfo.GlobalSettings.AllowCheats = settings.Server.AllowCheats; lobbyInfo.GlobalSettings.AllowCheats = settings.Server.AllowCheats;
lobbyInfo.GlobalSettings.ServerName = settings.Server.Name;
LoadMap(); // populates the Session's slots, too. LoadMap(); // populates the Session's slots, too.

3
OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs
View File

@@ -180,6 +180,9 @@ namespace OpenRA.Widgets.Delegates
if (MapUid == orderManager.LobbyInfo.GlobalSettings.Map) return; if (MapUid == orderManager.LobbyInfo.GlobalSettings.Map) return;
MapUid = orderManager.LobbyInfo.GlobalSettings.Map; MapUid = orderManager.LobbyInfo.GlobalSettings.Map;
Map = Game.modData.AvailableMaps[MapUid]; Map = Game.modData.AvailableMaps[MapUid];
var title = Widget.RootWidget.GetWidget<LabelWidget>("LOBBY_TITLE");
title.Text = "OpenRA Multiplayer Lobby - " + orderManager.LobbyInfo.GlobalSettings.ServerName;
} }
bool hasJoined = false; bool hasJoined = false;

3
mods/cnc/chrome/gamelobby.yaml
View File

@@ -7,6 +7,7 @@ Background@SERVER_LOBBY:
Height:600 Height:600
Children: Children:
Label@LOBBY_TITLE: Label@LOBBY_TITLE:
Id:LOBBY_TITLE
X:0 X:0
Y:20 Y:20
Align:Center Align:Center
@@ -16,7 +17,7 @@ Background@SERVER_LOBBY:
Text:OpenRA Multiplayer Lobby Text:OpenRA Multiplayer Lobby
Background@LOBBY_MAP_BG: Background@LOBBY_MAP_BG:
X:PARENT_RIGHT-268 X:PARENT_RIGHT-268
Y:39 Y:50
Width:252 Width:252
Height:252 Height:252
Background:dialog3 Background:dialog3

3
mods/ra/chrome/gamelobby.yaml
View File

@@ -8,6 +8,7 @@ Background@SERVER_LOBBY:
Visible:true Visible:true
Children: Children:
Label@LOBBY_TITLE: Label@LOBBY_TITLE:
Id:LOBBY_TITLE
X:0 X:0
Y:20 Y:20
Align:Center Align:Center
@@ -17,7 +18,7 @@ Background@SERVER_LOBBY:
Text:OpenRA Multiplayer Lobby Text:OpenRA Multiplayer Lobby
Background@LOBBY_MAP_BG: Background@LOBBY_MAP_BG:
X:PARENT_RIGHT-268 X:PARENT_RIGHT-268
Y:39 Y:50
Width:252 Width:252
Height:252 Height:252
Background:dialog3 Background:dialog3