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

Prevent player name from becoming part of a formatting string.

Browse Source 
fixes #6524
This commit is contained in:
Matthijs Benschop
2014-09-21 00:52:20 +02:00
parent ea11906938
commit 534f6c5a33
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,8 +241,8 @@ namespace OpenRA.Network
SetPlayerStance(world, order.Player, targetPlayer, newStance); SetPlayerStance(world, order.Player, targetPlayer, newStance);
Game.Debug("{0} has set diplomatic stance vs {1} to {2}".F( Game.Debug("{0} has set diplomatic stance vs {1} to {2}",
order.Player.PlayerName, targetPlayer.PlayerName, newStance)); order.Player.PlayerName, targetPlayer.PlayerName, newStance);
// automatically declare war reciprocally // automatically declare war reciprocally
if (newStance == Stance.Enemy && targetPlayer.Stances[order.Player] == Stance.Ally) if (newStance == Stance.Enemy && targetPlayer.Stances[order.Player] == Stance.Ally)

2
OpenRA.Game/Traits/Player/DeveloperMode.cs
View File

@@ -140,7 +140,7 @@ namespace OpenRA.Traits
return; return;
} }
Game.Debug("Cheat used: {0} by {1}".F(order.OrderString, self.Owner.PlayerName)); Game.Debug("Cheat used: {0} by {1}", order.OrderString, self.Owner.PlayerName);
} }
} }
} }

4
OpenRA.Mods.RA/ConquestVictoryConditions.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.RA
public void OnPlayerLost(Player player) public void OnPlayerLost(Player player)
{ {
Game.Debug("{0} is defeated.".F(player.PlayerName)); Game.Debug("{0} is defeated.", player.PlayerName);
foreach (var a in player.World.Actors.Where(a => a.Owner == player)) foreach (var a in player.World.Actors.Where(a => a.Owner == player))
a.Kill(a); a.Kill(a);
@@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA
public void OnPlayerWon(Player player) public void OnPlayerWon(Player player)
{ {
Game.Debug("{0} is victorious.".F(player.PlayerName)); Game.Debug("{0} is victorious.", player.PlayerName);
if (player == player.World.LocalPlayer) if (player == player.World.LocalPlayer)
Game.RunAfterDelay(info.NotificationDelay, () => Sound.PlayNotification(player.World.Map.Rules, player, "Speech", "Win", player.Country.Race)); Game.RunAfterDelay(info.NotificationDelay, () => Sound.PlayNotification(player.World.Map.Rules, player, "Speech", "Win", player.Country.Race));

4
OpenRA.Mods.RA/StrategicVictoryConditions.cs
View File

@@ -97,7 +97,7 @@ namespace OpenRA.Mods.RA
public void OnPlayerLost(Player player) public void OnPlayerLost(Player player)
{ {
Game.Debug("{0} is defeated.".F(player.PlayerName)); Game.Debug("{0} is defeated.", player.PlayerName);
foreach (var a in player.World.Actors.Where(a => a.Owner == player)) foreach (var a in player.World.Actors.Where(a => a.Owner == player))
a.Kill(a); a.Kill(a);
@@ -114,7 +114,7 @@ namespace OpenRA.Mods.RA
public void OnPlayerWon(Player player) public void OnPlayerWon(Player player)
{ {
Game.Debug("{0} is victorious.".F(player.PlayerName)); Game.Debug("{0} is victorious.", player.PlayerName);
if (player == player.World.LocalPlayer) if (player == player.World.LocalPlayer)
Game.RunAfterDelay(info.NotificationDelay, () => Sound.PlayNotification(player.World.Map.Rules, player, "Speech", "Win", player.Country.Race)); Game.RunAfterDelay(info.NotificationDelay, () => Sound.PlayNotification(player.World.Map.Rules, player, "Speech", "Win", player.Country.Race));