remove UIM-debug from settings (now in DeveloperMode trait)

This commit is contained in:
Bob
2010-10-20 17:38:43 +13:00
committed by Chris Forbes
parent 6012f1d592
commit de92a2fc0c
4 changed files with 11 additions and 10 deletions

View File

@@ -32,7 +32,6 @@ namespace OpenRA.GameRules
{
public bool PerfGraph = false;
public bool RecordSyncReports = true;
public bool ShowCollisions = false;
public float LongTickThreshold = 0.001f;
}

View File

@@ -17,7 +17,8 @@ namespace OpenRA.Traits
public bool FastBuild = false;
public bool FastCharge = false;
public bool DisableShroud = false;
public bool PathDebug = false;
public bool PathDebug = false;
public bool UnitInfluenceDebug = false;
public object Create (ActorInitializer init) { return new DeveloperMode(this); }
}
@@ -30,14 +31,16 @@ namespace OpenRA.Traits
[Sync] public bool FastBuild;
[Sync] public bool DisableShroud;
[Sync] public bool PathDebug;
[Sync] public bool UnitInfluenceDebug;
public DeveloperMode(DeveloperModeInfo info)
{
Info = info;
FastBuild = Info.FastBuild;
FastCharge = Info.FastCharge;
DisableShroud = Info.DisableShroud;
PathDebug = Info.PathDebug;
PathDebug = Info.PathDebug;
UnitInfluenceDebug = info.UnitInfluenceDebug;
}
public void ResolveOrder (Actor self, Order order)
@@ -79,9 +82,8 @@ namespace OpenRA.Traits
break;
}
case "DevUnitDebug":
{
if (self.World.LocalPlayer == self.Owner)
Game.Settings.Debug.ShowCollisions ^= true;
{
UnitInfluenceDebug ^= true;
break;
}
case "DevGiveExploration":

View File

@@ -41,7 +41,7 @@ namespace OpenRA
public void Draw( WorldRenderer wr, World world )
{
if (Game.Settings.Debug.ShowCollisions)
if (world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().UnitInfluenceDebug)
{
var uim = world.WorldActor.Trait<UnitInfluence>();

View File

@@ -47,8 +47,8 @@ namespace OpenRA.Widgets.Delegates
return true;
};
devmodeBG.GetWidget<CheckboxWidget>("CHECKBOX_UNITDEBUG").Checked =
() => Game.Settings.Debug.ShowCollisions;
devmodeBG.GetWidget<CheckboxWidget>("CHECKBOX_UNITDEBUG").Checked =
() => world.LocalPlayer.PlayerActor.Trait<DeveloperMode>().UnitInfluenceDebug;
devmodeBG.GetWidget("CHECKBOX_UNITDEBUG").OnMouseDown = mi =>
{
world.IssueOrder(new Order("DevUnitDebug", world.LocalPlayer.PlayerActor));