tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix connecting to a server with the lobby enabled.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-07-15 18:57:17 +02:00
parent cdcafbada6
commit 806e95b382
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/EntryPoint.cs
View File

@@ -195,11 +195,11 @@ namespace Content.Client
var inputMan = IoCManager.Resolve<IInputManager>(); var inputMan = IoCManager.Resolve<IInputManager>();
ContentContexts.SetupContexts(inputMan.Contexts); ContentContexts.SetupContexts(inputMan.Contexts);
IoCManager.Resolve<IGameHud>().Initialize();
IoCManager.Resolve<IClientNotifyManager>().Initialize(); IoCManager.Resolve<IClientNotifyManager>().Initialize();
IoCManager.Resolve<IClientGameTicker>().Initialize(); IoCManager.Resolve<IClientGameTicker>().Initialize();
IoCManager.Resolve<IOverlayManager>().AddOverlay(new ParallaxOverlay()); IoCManager.Resolve<IOverlayManager>().AddOverlay(new ParallaxOverlay());
IoCManager.Resolve<IChatManager>().Initialize(); IoCManager.Resolve<IChatManager>().Initialize();
IoCManager.Resolve<IGameHud>().Initialize();
} }
public override void Update(ModUpdateLevel level, float frameTime) public override void Update(ModUpdateLevel level, float frameTime)

2
Content.Client/GameTicking/ClientGameTicker.cs
View File

@@ -178,7 +178,7 @@ namespace Content.Client.GameTicking
_tutorialButton = null; _tutorialButton = null;
} }
_gameHud.RootControl?.Parent.RemoveChild(_gameHud.RootControl); _gameHud.RootControl.Parent?.RemoveChild(_gameHud.RootControl);
_tickerState = TickerState.InLobby; _tickerState = TickerState.InLobby;