working rebase

This commit is contained in:
Oiltanker
2022-04-15 21:35:01 +03:00
parent e4ea88d598
commit 56a0d4b1e1
7 changed files with 15 additions and 15 deletions
@@ -442,7 +442,7 @@ namespace Barotrauma
}
};
string version = File.Exists(LuaSetup.VERSION_FILE) ? File.ReadAllText(LuaSetup.VERSION_FILE) : "Github";
string version = File.Exists(LuaCsSetup.VERSION_FILE) ? File.ReadAllText(LuaCsSetup.VERSION_FILE) : "Github";
new GUITextBlock(new RectTransform(new Point(300, 30), Frame.RectTransform, Anchor.TopLeft) { AbsoluteOffset = new Point(10, 10) }, $"Using LuaCsForBarotrauma revision {AssemblyInfo.GitRevision} version {version}", Color.Red)
{
@@ -525,7 +525,7 @@ namespace Barotrauma
#region Selection
public override void Select()
{
GameMain.Lua.Stop();
GameMain.LuaCs.Stop();
if (WorkshopItemsToUpdate.Any())
{
@@ -90,7 +90,7 @@ namespace Barotrauma
.Where(p => p != null).ToArray());
}
GameMain.NetLobbyScreen.Select();
GameMain.Lua.Initialize();
GameMain.LuaCs.Initialize();
return;
}
@@ -299,7 +299,7 @@ namespace Barotrauma
ContentPackageManager.EnabledPackages.SetRegular(regularPackages);
GameMain.NetLobbyScreen.Select();
GameMain.Lua.Initialize();
GameMain.LuaCs.Initialize();
}
}
}
@@ -1049,7 +1049,7 @@ namespace Barotrauma
GameMain.SubEditorScreen.Select();
};
GameMain.Lua.Initialize();
GameMain.LuaCs.Initialize();
return true;
}
@@ -1319,7 +1319,7 @@ namespace Barotrauma
public void Select(bool enableAutoSave = true)
{
GameMain.Lua.Stop();
GameMain.LuaCs.Stop();
base.Select();