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

Rename some settings

Browse Source
This commit is contained in:
Paul Chote
2010-08-24 19:45:36 +12:00
parent 1143f496db
commit c3b3947b9d
14 changed files with 66 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Widgets.Delegates
var map = Game.modData.AvailableMaps.Keys.FirstOrDefault();
settings.Server.LastServerTitle = cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text;
settings.Server.Name = cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text;
settings.Server.ListenPort = int.Parse(cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text);
settings.Server.ExternalPort = int.Parse(cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text);
settings.Save();
@@ -47,7 +47,7 @@ namespace OpenRA.Widgets.Delegates
return true;
};
cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text = settings.Server.LastServerTitle;
cs.GetWidget<TextFieldWidget>("GAME_TITLE").Text = settings.Server.Name;
cs.GetWidget<TextFieldWidget>("LISTEN_PORT").Text = settings.Server.ListenPort.ToString();
cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text = settings.Server.ExternalPort.ToString();
cs.GetWidget<CheckboxWidget>("CHECKBOX_ONLINE").Checked = () => settings.Server.AdvertiseOnline;

2
OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Widgets.Delegates
};
devmodeBG.GetWidget<CheckboxWidget>("SETTINGS_CHECKBOX_UNITDEBUG").Checked =
() => Game.Settings.Debug.UnitDebug;
() => Game.Settings.Debug.ShowCollisions;
devmodeBG.GetWidget("SETTINGS_CHECKBOX_UNITDEBUG").OnMouseDown = mi =>
{
Game.IssueOrder(new Order("DevUnitDebug", Game.world.LocalPlayer.PlayerActor));

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

@@ -33,8 +33,8 @@ namespace OpenRA.Widgets.Delegates
Game.LobbyInfoChanged += UpdateCurrentMap;
UpdateCurrentMap();
CurrentColorPreview1 = Game.Settings.Player.PlayerColor1;
CurrentColorPreview2 = Game.Settings.Player.PlayerColor2;
CurrentColorPreview1 = Game.Settings.Player.Color1;
CurrentColorPreview2 = Game.Settings.Player.Color2;
var r = Widget.RootWidget;
var lobby = r.GetWidget("SERVER_LOBBY");
@@ -162,8 +162,8 @@ namespace OpenRA.Widgets.Delegates
var c1 = ColorFromHSL(hf, sf, lf);
var c2 = ColorFromHSL(hf, sf, r*lf);
Game.Settings.Player.PlayerColor1 = c1;
Game.Settings.Player.PlayerColor2 = c2;
Game.Settings.Player.Color1 = c1;
Game.Settings.Player.Color2 = c2;
Game.Settings.Save();
Game.IssueOrder(Order.Command("color {0},{1},{2},{3},{4},{5}".F(c1.R,c1.G,c1.B,c2.R,c2.G,c2.B)));
}
@@ -220,11 +220,11 @@ namespace OpenRA.Widgets.Delegates
return;
hasJoined = true;
if (Game.LocalClient.Name != Game.Settings.Player.PlayerName)
Game.IssueOrder(Order.Command("name " + Game.Settings.Player.PlayerName));
if (Game.LocalClient.Name != Game.Settings.Player.Name)
Game.IssueOrder(Order.Command("name " + Game.Settings.Player.Name));
var c1 = Game.Settings.Player.PlayerColor1;
var c2 = Game.Settings.Player.PlayerColor2;
var c1 = Game.Settings.Player.Color1;
var c2 = Game.Settings.Player.Color2;
if (Game.LocalClient.Color1 != c1 || Game.LocalClient.Color2 != c2)
Game.IssueOrder(Order.Command("color {0},{1},{2},{3},{4},{5}".F(c1.R,c1.G,c1.B,c2.R,c2.G,c2.B)));
@@ -264,7 +264,7 @@ namespace OpenRA.Widgets.Delegates
return true;
Game.IssueOrder(Order.Command("name " + name.Text));
Game.Settings.Player.PlayerName = name.Text;
Game.Settings.Player.Name = name.Text;
Game.Settings.Save();
return true;
};

2
OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Widgets.Delegates
{
var r = Widget.RootWidget;
var perfRoot = r.GetWidget("PERF_BG");
perfRoot.IsVisible = () => perfRoot.Visible && Game.Settings.Debug.PerfDebug;
perfRoot.IsVisible = () => perfRoot.Visible && Game.Settings.Debug.PerfGraph;
// Perf text
var perfText = perfRoot.GetWidget<LabelWidget>("TEXT");

4
OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
View File

@@ -91,7 +91,7 @@ namespace OpenRA.Widgets.Delegates
{
r.CloseWindow();
dc.GetWidget<TextFieldWidget>("SERVER_ADDRESS").Text = Game.Settings.General.LastServer;
dc.GetWidget<TextFieldWidget>("SERVER_ADDRESS").Text = Game.Settings.Player.LastServer;
r.OpenWindow("DIRECTCONNECT_BG");
return true;
};
@@ -133,7 +133,7 @@ namespace OpenRA.Widgets.Delegates
if (cpts.Length != 2)
return true;
Game.Settings.General.LastServer = address;
Game.Settings.Player.LastServer = address;
Game.Settings.Save();
r.CloseWindow();

26
OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs Executable file → Normal file
View File

@@ -34,31 +34,31 @@ namespace OpenRA.Widgets.Delegates
var general = bg.GetWidget("GENERAL_PANE");
var name = general.GetWidget<TextFieldWidget>("NAME");
name.Text = Game.Settings.Player.PlayerName;
name.Text = Game.Settings.Player.Name;
name.OnLoseFocus = () =>
{
name.Text = name.Text.Trim();
if (name.Text.Length == 0)
name.Text = Game.Settings.Player.PlayerName;
name.Text = Game.Settings.Player.Name;
else
Game.Settings.Player.PlayerName = name.Text;
Game.Settings.Player.Name = name.Text;
};
name.OnEnterKey = () => { name.LoseFocus(); return true; };
var edgeScroll = general.GetWidget<CheckboxWidget>("EDGE_SCROLL");
edgeScroll.Checked = () => Game.Settings.General.ViewportEdgeScroll;
edgeScroll.Checked = () => Game.Settings.Game.ViewportEdgeScroll;
edgeScroll.OnMouseDown = mi =>
{
Game.Settings.General.ViewportEdgeScroll ^= true;
Game.Settings.Game.ViewportEdgeScroll ^= true;
return true;
};
var inverseScroll = general.GetWidget<CheckboxWidget>("INVERSE_SCROLL");
inverseScroll.Checked = () => Game.Settings.General.InverseDragScroll;
inverseScroll.Checked = () => Game.Settings.Game.InverseDragScroll;
inverseScroll.OnMouseDown = mi =>
{
Game.Settings.General.InverseDragScroll ^= true;
Game.Settings.Game.InverseDragScroll ^= true;
return true;
};
@@ -77,10 +77,10 @@ namespace OpenRA.Widgets.Delegates
// Display
var display = bg.GetWidget("DISPLAY_PANE");
var fullscreen = display.GetWidget<CheckboxWidget>("FULLSCREEN_CHECKBOX");
fullscreen.Checked = () => {return Game.Settings.Graphics.WindowMode != WindowMode.Windowed;};
fullscreen.Checked = () => {return Game.Settings.Graphics.Mode != WindowMode.Windowed;};
fullscreen.OnMouseDown = mi =>
{
Game.Settings.Graphics.WindowMode = (Game.Settings.Graphics.WindowMode == WindowMode.Windowed) ? WindowMode.PseudoFullscreen : WindowMode.Windowed;
Game.Settings.Graphics.Mode = (Game.Settings.Graphics.Mode == WindowMode.Windowed) ? WindowMode.PseudoFullscreen : WindowMode.Windowed;
return true;
};
@@ -125,10 +125,10 @@ namespace OpenRA.Widgets.Delegates
// Debug
var debug = bg.GetWidget("DEBUG_PANE");
var perfdebug = debug.GetWidget<CheckboxWidget>("PERFDEBUG_CHECKBOX");
perfdebug.Checked = () => {return Game.Settings.Debug.PerfDebug;};
perfdebug.Checked = () => {return Game.Settings.Debug.PerfGraph;};
perfdebug.OnMouseDown = mi =>
{
Game.Settings.Debug.PerfDebug ^= true;
Game.Settings.Debug.PerfGraph ^= true;
return true;
};
@@ -141,10 +141,10 @@ namespace OpenRA.Widgets.Delegates
};
var timedebug = debug.GetWidget<CheckboxWidget>("GAMETIME_CHECKBOX");
timedebug.Checked = () => {return Game.Settings.Debug.ShowGameTimer;};
timedebug.Checked = () => {return Game.Settings.Game.MatchTimer;};
timedebug.OnMouseDown = mi =>
{
Game.Settings.Debug.ShowGameTimer ^= true;
Game.Settings.Game.MatchTimer ^= true;
return true;
};

2
OpenRA.Game/Widgets/TimerWidget.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Widgets
public TimerWidget ()
{
IsVisible = () => Game.Settings.Debug.ShowGameTimer;
IsVisible = () => Game.Settings.Game.MatchTimer;
}
public override void DrawInner(World world)

6
OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs Executable file → Normal file
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Widgets
if (mi.Event == MouseInputEvent.Move &&
(mi.Button == MouseButton.Middle || mi.Button == (MouseButton.Left | MouseButton.Right)))
{
int InverseScroll = Game.Settings.General.InverseDragScroll ? -1 : 1;
int InverseScroll = Game.Settings.Game.InverseDragScroll ? -1 : 1;
Game.viewport.Scroll((Viewport.LastMousePos - mi.Location) * InverseScroll);
return true;
}
@@ -48,7 +48,7 @@ namespace OpenRA.Widgets
public override string GetCursor(int2 pos)
{
if (!Game.Settings.General.ViewportEdgeScroll)
if (!Game.Settings.Game.ViewportEdgeScroll)
return null;
if (Edge.Includes(ScrollDirection.Up) && Edge.Includes(ScrollDirection.Left))
@@ -93,7 +93,7 @@ namespace OpenRA.Widgets
public override void Tick(World world)
{
Edge = ScrollDirection.None;
if (Game.Settings.General.ViewportEdgeScroll)
if (Game.Settings.Game.ViewportEdgeScroll)
{
// Check for edge-scroll
if (Viewport.LastMousePos.X < EdgeScrollThreshold)