initial cs-lua merge work
This commit is contained in:
@@ -20,8 +20,7 @@ namespace Barotrauma
|
||||
{
|
||||
class GameMain : Game
|
||||
{
|
||||
public static LuaSetup Lua;
|
||||
public static NetSetup Net;
|
||||
public static LuaCsSetup LuaCs;
|
||||
|
||||
public static bool ShowFPS = false;
|
||||
public static bool ShowPerf = false;
|
||||
@@ -227,9 +226,7 @@ namespace Barotrauma
|
||||
throw new Exception("Content folder not found. If you are trying to compile the game from the source code and own a legal copy of the game, you can copy the Content folder from the game's files to BarotraumaShared/Content.");
|
||||
}
|
||||
|
||||
Lua = new LuaSetup();
|
||||
Net = new NetSetup();
|
||||
Net.Execute();
|
||||
LuaCs = new LuaCsSetup();
|
||||
|
||||
GameSettings.Init();
|
||||
|
||||
@@ -925,9 +922,8 @@ namespace Barotrauma
|
||||
|
||||
SoundManager?.Update();
|
||||
|
||||
GameMain.Lua.Update();
|
||||
GameMain.Lua.hook.Call("think", new object[] { });
|
||||
GameMain.Net.Update();
|
||||
GameMain.LuaCs.Update();
|
||||
GameMain.LuaCs.hook.Call("think");
|
||||
|
||||
Timing.Accumulator -= Timing.Step;
|
||||
|
||||
@@ -1093,8 +1089,7 @@ namespace Barotrauma
|
||||
MainMenuScreen.Select();
|
||||
GameSession = null;
|
||||
|
||||
GameMain.Lua.Stop();
|
||||
GameMain.Net.Stop();
|
||||
GameMain.LuaCs.Stop();
|
||||
}
|
||||
|
||||
public void ShowCampaignDisclaimer(Action onContinue = null)
|
||||
|
||||
Reference in New Issue
Block a user