Rename some settings

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

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)