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

lots more fixes; still doesnt work

Browse Source
This commit is contained in:
Chris Forbes
2010-03-17 20:28:46 +13:00
parent f6b4f70cd7
commit 16f9f5ce89
6 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Chat.cs
View File

@@ -60,9 +60,9 @@ namespace OpenRA
typing += c;
}
public void AddLine(Player p, string text)
public void AddLine(Session.Client p, string text)
{
AddLine(p.Color, p.PlayerName, text);
AddLine(Player.PlayerColors[p.PaletteIndex].c, p.Name, text);
}
public void AddLine(Color c, string from, string text)

2
OpenRA.Game/Chrome.cs
View File

@@ -509,7 +509,7 @@ namespace OpenRA
paletteRect.Bottom+Game.viewport.Location.Y - 5),
Player.PlayerColors[client.PaletteIndex].c);
lineRenderer.Flush();
f.DrawText(rgbaRenderer, client.Country, new int2(r.Left + 220, y), Color.White);
f.DrawText(rgbaRenderer, client.Country ?? "Unknown", new int2(r.Left + 220, y), Color.White);
f.DrawText(rgbaRenderer, client.State.ToString(), new int2(r.Left + 290, y), Color.White);
f.DrawText(rgbaRenderer, (client.SpawnPoint == 0) ? "-" : client.SpawnPoint.ToString(), new int2(r.Left + 410, y), Color.White);
y += 30;

2
OpenRA.Game/Game.cs
View File

@@ -238,8 +238,6 @@ namespace OpenRA
var client = new Session.Client();
FieldLoader.Load(client, y.Value);
session.Clients.Add(client);
world.players[index].SyncFromLobby(client);
}
LobbyInfo = session;

5
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -32,8 +32,9 @@ namespace OpenRA.Network
{
case "Chat":
{
var player = world.players.Values.Where( p => p.Index == clientId ).Single();
Game.chat.AddLine(player, order.TargetString);
var client = Game.LobbyInfo.Clients.FirstOrDefault(c => c.Index == clientId);
if (client != null)
Game.chat.AddLine(client, order.TargetString);
break;
}
case "StartGame":

8
OpenRA.Game/Player.cs
View File

@@ -195,7 +195,7 @@ namespace OpenRA
{
if (PlayerName != client.Name)
{
Game.chat.AddLine(this, "is now known as " + client.Name);
//Game.chat.AddLine(this, "is now known as " + client.Name);
PlayerName = client.Name;
}
@@ -204,20 +204,20 @@ namespace OpenRA
if (Country.Name != client.Country)
{
Game.chat.AddLine(this, "is now playing {0}".F(client.Country));
//Game.chat.AddLine(this, "is now playing {0}".F(client.Country));
Country = PlayerActor.World.GetCountries().First(c => c.Name == client.Country);
}
if (PaletteIndex != client.PaletteIndex)
{
PaletteIndex = client.PaletteIndex;
Game.chat.AddLine(this, "has changed color to {0}".F(PlayerColors[client.PaletteIndex].b));
//Game.chat.AddLine(this, "has changed color to {0}".F(PlayerColors[client.PaletteIndex].b));
}
if (SpawnPointIndex != client.SpawnPoint)
{
SpawnPointIndex = client.SpawnPoint;
Game.chat.AddLine(this, "has changed spawn point to {0}".F(client.SpawnPoint));
//Game.chat.AddLine(this, "has changed spawn point to {0}".F(client.SpawnPoint));
}
}
}

2
OpenRA.Game/World.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA
{
localPlayerIndex = index;
Game.viewport.GoToStartLocation(LocalPlayer);
Game.chat.AddLine(LocalPlayer, "is now YOU");
//Game.chat.AddLine(LocalPlayer, "is now YOU");
}
if (!string.IsNullOrEmpty(Game.Settings.PlayerName) && LocalPlayer.PlayerName != Game.Settings.PlayerName)
Game.IssueOrder(Order.Chat("/name " + Game.Settings.PlayerName));