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

Use static ctors for static setup.

Browse Source
This commit is contained in:
Paul Chote
2011-05-23 18:14:01 +12:00
parent a5fdfbfd60
commit a288c5df15
3 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Cnc/Widgets/Logic/CncConnectionLogic.cs
View File

@@ -16,11 +16,15 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
{ {
public class CncConnectingLogic public class CncConnectingLogic
{ {
static bool staticSetup;
Action onConnect, onRetry, onAbort; Action onConnect, onRetry, onAbort;
string host; string host;
int port; int port;
static CncConnectingLogic()
{
Game.ConnectionStateChanged += ConnectionStateChangedStub;
}
static void ConnectionStateChangedStub(OrderManager om) static void ConnectionStateChangedStub(OrderManager om)
{ {
var panel = Widget.RootWidget.GetWidget("CONNECTING_PANEL"); var panel = Widget.RootWidget.GetWidget("CONNECTING_PANEL");
@@ -68,11 +72,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
this.onConnect = onConnect; this.onConnect = onConnect;
this.onRetry = onRetry; this.onRetry = onRetry;
this.onAbort = onAbort; this.onAbort = onAbort;
if (!staticSetup)
{
staticSetup = true;
Game.ConnectionStateChanged += ConnectionStateChangedStub;
}
var panel = widget.GetWidget("CONNECTING_PANEL"); var panel = widget.GetWidget("CONNECTING_PANEL");
panel.GetWidget<ButtonWidget>("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); }; panel.GetWidget<ButtonWidget>("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); };

11
OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs
View File

@@ -19,8 +19,12 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
enum MenuType { None, Diplomacy, Cheats } enum MenuType { None, Diplomacy, Cheats }
MenuType menu = MenuType.None; MenuType menu = MenuType.None;
static bool staticSetup;
Widget ingameRoot; Widget ingameRoot;
static CncIngameChromeLogic()
{
Game.AddChatLine += AddChatLineStub;
}
static void AddChatLineStub(Color c, string from, string text) static void AddChatLineStub(Color c, string from, string text)
{ {
@@ -49,11 +53,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
.Fade(CncMenuPaletteEffect.EffectType.None); .Fade(CncMenuPaletteEffect.EffectType.None);
ingameRoot = widget.GetWidget("INGAME_ROOT"); ingameRoot = widget.GetWidget("INGAME_ROOT");
if (!staticSetup)
{
staticSetup = true;
Game.AddChatLine += AddChatLineStub;
}
if (world.LocalPlayer != null) if (world.LocalPlayer != null)
widget.GetWidget("PLAYER_WIDGETS").IsVisible = () => true; widget.GetWidget("PLAYER_WIDGETS").IsVisible = () => true;

20
OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs
View File

@@ -37,7 +37,14 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
readonly Action onExit; readonly Action onExit;
readonly OrderManager orderManager; readonly OrderManager orderManager;
static bool staticSetup; static CncLobbyLogic()
{
Game.LobbyInfoChanged += LobbyInfoChangedStub;
Game.BeforeGameStart += BeforeGameStartStub;
Game.AddChatLine += AddChatLineStub;
Game.ConnectionStateChanged += ConnectionStateChangedStub;
}
public static CncLobbyLogic GetHandler() public static CncLobbyLogic GetHandler()
{ {
var panel = Widget.RootWidget.GetWidget("SERVER_LOBBY"); var panel = Widget.RootWidget.GetWidget("SERVER_LOBBY");
@@ -127,16 +134,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
this.orderManager = orderManager; this.orderManager = orderManager;
this.OnGameStart = () => { Widget.CloseWindow(); onStart(); }; this.OnGameStart = () => { Widget.CloseWindow(); onStart(); };
this.onExit = onExit; this.onExit = onExit;
if (!staticSetup)
{
staticSetup = true;
Game.LobbyInfoChanged += LobbyInfoChangedStub;
Game.BeforeGameStart += BeforeGameStartStub;
Game.AddChatLine += AddChatLineStub;
Game.ConnectionStateChanged += ConnectionStateChangedStub;
}
UpdateCurrentMap(); UpdateCurrentMap();
PlayerPalettePreview = world.WorldActor.Trait<CncColorPickerPaletteModifier>(); PlayerPalettePreview = world.WorldActor.Trait<CncColorPickerPaletteModifier>();
PlayerPalettePreview.Ramp = Game.Settings.Player.ColorRamp; PlayerPalettePreview.Ramp = Game.Settings.Player.ColorRamp;