remove 'private' keyword where possible

This commit is contained in:
Chris Forbes
2011-06-29 09:15:39 +12:00
parent 587b2ef0d1
commit 0e45968573
16 changed files with 27 additions and 34 deletions

View File

@@ -48,7 +48,7 @@ namespace OpenRA
[Sync]
public Player Owner;
private Activity currentActivity;
Activity currentActivity;
public Group Group;
internal Actor(World world, string name, TypeDictionary initDict )

View File

@@ -32,7 +32,7 @@ namespace OpenRA
public static int CellSize { get { return modData.Manifest.TileSize; } }
public static ModData modData;
private static WorldRenderer worldRenderer;
static WorldRenderer worldRenderer;
public static Viewport viewport;
public static Settings Settings;

View File

@@ -22,7 +22,7 @@ namespace OpenRA
{
public readonly Manifest Manifest;
public readonly ObjectCreator ObjectCreator;
public Dictionary<string, Map> AvailableMaps {get; private set;}
public Dictionary<string, Map> AvailableMaps { get; private set; }
public readonly WidgetLoader WidgetLoader;
public ILoadScreen LoadScreen = null;
public SheetBuilder SheetBuilder;

View File

@@ -26,7 +26,7 @@ namespace OpenRA
public int Deaths;
public WinState WinState = WinState.Undefined;
public readonly ColorRamp ColorRamp;
public readonly ColorRamp ColorRamp;
public readonly string PlayerName;
public readonly string InternalName;

View File

@@ -16,7 +16,7 @@ namespace OpenRA.Widgets
public class ScrollingTextWidget : Widget
{
public string Text = "";
private string ScrollingText = "";
string ScrollingText = "";
public string Background = null;
@@ -27,10 +27,10 @@ namespace OpenRA.Widgets
// ticks per single letter scroll
public int ScrollRate = 4;
private string ScrollBuffer = "";
string ScrollBuffer = "";
private int ScrollLocation = 0;
private int ScrollTick = 0;
int ScrollLocation = 0;
int ScrollTick = 0;
public Func<string> GetText;
public Func<string> GetBackground;
@@ -67,22 +67,18 @@ namespace OpenRA.Widgets
ScrollTick = 0;
}
private void UpdateScrollBuffer()
void UpdateScrollBuffer()
{
ScrollTick++;
if (ScrollTick < ScrollRate)
{
return;
}
ScrollTick = 0;
ScrollBuffer = "";
if (ScrollingText.Substring(ScrollingText.Length - 4, 3) != " ")
{
ScrollingText += " ";
}
int tempScrollLocation = ScrollLocation;
for (int i = 0; i < ScrollLength; ++i)

View File

@@ -27,7 +27,7 @@ namespace OpenRA.Widgets
// This is bogus
public float2 Range = new float2(0f, 1f);
private float Offset = 0;
float Offset = 0;
int2 lastMouseLocation;
protected bool isMoving = false;

View File

@@ -52,7 +52,7 @@ namespace OpenRA.Widgets
get { return rootWidget; }
set { rootWidget = value; }
}
private static Widget rootWidget = new ContainerWidget();
static Widget rootWidget = new ContainerWidget();
public Widget(Widget widget)
{
@@ -401,4 +401,4 @@ namespace OpenRA.Widgets
{
void Init();
}
}
}