Fix a pile of compile warnings and debug log spam. Fix <playername> (Dead) in chat
This commit is contained in:
@@ -52,13 +52,11 @@ namespace OpenRA.Network
|
|||||||
class ReplayRecorderConnection : IConnection
|
class ReplayRecorderConnection : IConnection
|
||||||
{
|
{
|
||||||
IConnection inner;
|
IConnection inner;
|
||||||
FileStream replayFile;
|
|
||||||
BinaryWriter writer;
|
BinaryWriter writer;
|
||||||
|
|
||||||
public ReplayRecorderConnection( IConnection inner, FileStream replayFile )
|
public ReplayRecorderConnection( IConnection inner, FileStream replayFile )
|
||||||
{
|
{
|
||||||
this.inner = inner;
|
this.inner = inner;
|
||||||
this.replayFile = replayFile;
|
|
||||||
this.writer = new BinaryWriter( replayFile );
|
this.writer = new BinaryWriter( replayFile );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ namespace OpenRA.Network
|
|||||||
{
|
{
|
||||||
var player = world != null ? world.FindPlayerByClient(client) : null;
|
var player = world != null ? world.FindPlayerByClient(client) : null;
|
||||||
var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : "";
|
var suffix = (player != null && player.WinState == WinState.Lost) ? " (Dead)" : "";
|
||||||
Game.AddChatLine(client.Color1, client.Name, order.TargetString);
|
Game.AddChatLine(client.Color1, client.Name+suffix, order.TargetString);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
Game.AddChatLine(Color.White, "(player {0})".F(clientId), order.TargetString);
|
Game.AddChatLine(Color.White, "(player {0})".F(clientId), order.TargetString);
|
||||||
@@ -105,7 +105,6 @@ namespace OpenRA.Network
|
|||||||
case "SetStance":
|
case "SetStance":
|
||||||
{
|
{
|
||||||
var targetPlayer = order.Player.World.players[order.TargetLocation.X];
|
var targetPlayer = order.Player.World.players[order.TargetLocation.X];
|
||||||
var oldStance = order.Player.Stances[targetPlayer];
|
|
||||||
var newStance = (Stance)order.TargetLocation.Y;
|
var newStance = (Stance)order.TargetLocation.Y;
|
||||||
|
|
||||||
SetPlayerStance(world, order.Player, targetPlayer, newStance);
|
SetPlayerStance(world, order.Player, targetPlayer, newStance);
|
||||||
|
|||||||
@@ -27,11 +27,9 @@ namespace OpenRA.Widgets.Delegates
|
|||||||
{
|
{
|
||||||
public class DeveloperModeDelegate : IWidgetDelegate
|
public class DeveloperModeDelegate : IWidgetDelegate
|
||||||
{
|
{
|
||||||
readonly World world;
|
|
||||||
[ObjectCreator.UseCtor]
|
[ObjectCreator.UseCtor]
|
||||||
public DeveloperModeDelegate( [ObjectCreator.Param] World world )
|
public DeveloperModeDelegate( [ObjectCreator.Param] World world )
|
||||||
{
|
{
|
||||||
this.world = world;
|
|
||||||
var devmodeBG = Widget.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG");
|
var devmodeBG = Widget.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG");
|
||||||
var devModeButton = Widget.RootWidget.GetWidget<ButtonWidget>("INGAME_DEVELOPERMODE_BUTTON");
|
var devModeButton = Widget.RootWidget.GetWidget<ButtonWidget>("INGAME_DEVELOPERMODE_BUTTON");
|
||||||
|
|
||||||
|
|||||||
@@ -45,10 +45,7 @@ namespace OpenRA.Mods.RA
|
|||||||
{
|
{
|
||||||
var bi = Rules.Info[bridge].Traits.Get<BridgeInfo>();
|
var bi = Rules.Info[bridge].Traits.Get<BridgeInfo>();
|
||||||
foreach (var template in bi.Templates)
|
foreach (var template in bi.Templates)
|
||||||
{
|
|
||||||
BridgeTypes.Add(template.First, Pair.New(bridge, template.Second));
|
BridgeTypes.Add(template.First, Pair.New(bridge, template.Second));
|
||||||
Log.Write("debug", "Adding template {0} for bridge {1}", template, bridge);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Loop through the map looking for templates to overlay
|
// Loop through the map looking for templates to overlay
|
||||||
@@ -66,9 +63,7 @@ namespace OpenRA.Mods.RA
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ConvertBridgeToActor(World w, int i, int j)
|
void ConvertBridgeToActor(World w, int i, int j)
|
||||||
{
|
{
|
||||||
Log.Write("debug", "Converting bridge at {0} {1}", i, j);
|
|
||||||
|
|
||||||
// This cell already has a bridge overlaying it from a previous iteration
|
// This cell already has a bridge overlaying it from a previous iteration
|
||||||
if (Bridges[i,j] != null)
|
if (Bridges[i,j] != null)
|
||||||
return;
|
return;
|
||||||
@@ -104,9 +99,7 @@ namespace OpenRA.Mods.RA
|
|||||||
// This isn't the bridge you're looking for
|
// This isn't the bridge you're looking for
|
||||||
if (!w.Map.IsInMap(x, y) || w.Map.MapTiles[x, y].image != ind)
|
if (!w.Map.IsInMap(x, y) || w.Map.MapTiles[x, y].image != ind)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
Log.Write("debug", "Adding tile {0} {1} for type {2}", x,y,tile);
|
|
||||||
|
|
||||||
subTiles.Add(new int2(x,y),ind);
|
subTiles.Add(new int2(x,y),ind);
|
||||||
Bridges[x,y] = bridge;
|
Bridges[x,y] = bridge;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,11 +34,9 @@ namespace OpenRA.Mods.RA.Orders
|
|||||||
world.CancelInputMode();
|
world.CancelInputMode();
|
||||||
|
|
||||||
var ret = InnerOrder( world, xy, mi ).ToList();
|
var ret = InnerOrder( world, xy, mi ).ToList();
|
||||||
foreach( var order in ret )
|
if (ret.Count > 0)
|
||||||
{
|
|
||||||
world.CancelInputMode();
|
world.CancelInputMode();
|
||||||
break;
|
|
||||||
}
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -276,7 +276,7 @@ namespace OpenRA.Mods.RA
|
|||||||
OnComplete = onComplete;
|
OnComplete = onComplete;
|
||||||
Queue = queue;
|
Queue = queue;
|
||||||
|
|
||||||
Log.Write("debug", "new ProductionItem: {0} time={1} cost={2}", item, time, cost);
|
//Log.Write("debug", "new ProductionItem: {0} time={1} cost={2}", item, time, cost);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Tick(PlayerResources pr, PowerManager pm)
|
public void Tick(PlayerResources pr, PowerManager pm)
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ namespace OpenRA.Mods.RA
|
|||||||
foreach (var t in self.TraitsImplementing<INotifyProduction>())
|
foreach (var t in self.TraitsImplementing<INotifyProduction>())
|
||||||
t.UnitProduced(self, newUnit, exit);
|
t.UnitProduced(self, newUnit, exit);
|
||||||
|
|
||||||
Log.Write("debug", "{0} #{1} produced by {2} #{3}", newUnit.Info.Name, newUnit.ActorID, self.Info.Name, self.ActorID);
|
//Log.Write("debug", "{0} #{1} produced by {2} #{3}", newUnit.Info.Name, newUnit.ActorID, self.Info.Name, self.ActorID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual bool Produce( Actor self, ActorInfo producee )
|
public virtual bool Produce( Actor self, ActorInfo producee )
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ namespace OpenRA.Mods.RA
|
|||||||
foreach (var s in self.Info.Traits.WithInterface<ExitInfo>())
|
foreach (var s in self.Info.Traits.WithInterface<ExitInfo>())
|
||||||
{
|
{
|
||||||
var exit = self.Location + s.ExitCell;
|
var exit = self.Location + s.ExitCell;
|
||||||
var spawn = self.CenterLocation + s.SpawnOffset;
|
|
||||||
if (!self.World.WorldActor.Trait<UnitInfluence>().GetUnitsAt( exit ).Any())
|
if (!self.World.WorldActor.Trait<UnitInfluence>().GetUnitsAt( exit ).Any())
|
||||||
{
|
{
|
||||||
var newUnit = self.World.CreateActor( producee.Name, new TypeDictionary
|
var newUnit = self.World.CreateActor( producee.Name, new TypeDictionary
|
||||||
@@ -53,7 +52,7 @@ namespace OpenRA.Mods.RA
|
|||||||
foreach (var t in self.TraitsImplementing<INotifyProduction>())
|
foreach (var t in self.TraitsImplementing<INotifyProduction>())
|
||||||
t.UnitProduced(self, newUnit, exit);
|
t.UnitProduced(self, newUnit, exit);
|
||||||
|
|
||||||
Log.Write("debug", "{0} #{1} produced by {2} #{3}", newUnit.Info.Name, newUnit.ActorID, self.Info.Name, self.ActorID);
|
//Log.Write("debug", "{0} #{1} produced by {2} #{3}", newUnit.Info.Name, newUnit.ActorID, self.Info.Name, self.ActorID);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -119,11 +119,8 @@ namespace OpenRA.Mods.RA
|
|||||||
world.CancelInputMode();
|
world.CancelInputMode();
|
||||||
|
|
||||||
var ret = OrderInner( world, xy, mi ).ToList();
|
var ret = OrderInner( world, xy, mi ).ToList();
|
||||||
foreach( var order in ret )
|
if (ret.Count > 0)
|
||||||
{
|
|
||||||
world.CancelInputMode();
|
world.CancelInputMode();
|
||||||
break;
|
|
||||||
}
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,11 +15,9 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
|
|||||||
{
|
{
|
||||||
public class IngameChromeDelegate : IWidgetDelegate
|
public class IngameChromeDelegate : IWidgetDelegate
|
||||||
{
|
{
|
||||||
readonly World world;
|
|
||||||
[ObjectCreator.UseCtor]
|
[ObjectCreator.UseCtor]
|
||||||
public IngameChromeDelegate( [ObjectCreator.Param] World world )
|
public IngameChromeDelegate( [ObjectCreator.Param] World world )
|
||||||
{
|
{
|
||||||
this.world = world;
|
|
||||||
var r = Widget.RootWidget;
|
var r = Widget.RootWidget;
|
||||||
var gameRoot = r.GetWidget("INGAME_ROOT");
|
var gameRoot = r.GetWidget("INGAME_ROOT");
|
||||||
var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG");
|
var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG");
|
||||||
|
|||||||
@@ -16,11 +16,9 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
|
|||||||
{
|
{
|
||||||
public class OrderButtonsChromeDelegate : IWidgetDelegate
|
public class OrderButtonsChromeDelegate : IWidgetDelegate
|
||||||
{
|
{
|
||||||
readonly World world;
|
|
||||||
[ObjectCreator.UseCtor]
|
[ObjectCreator.UseCtor]
|
||||||
public OrderButtonsChromeDelegate( [ObjectCreator.Param] World world )
|
public OrderButtonsChromeDelegate( [ObjectCreator.Param] World world )
|
||||||
{
|
{
|
||||||
this.world = world;
|
|
||||||
var r = Widget.RootWidget;
|
var r = Widget.RootWidget;
|
||||||
var gameRoot = r.GetWidget("INGAME_ROOT");
|
var gameRoot = r.GetWidget("INGAME_ROOT");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user