vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

working rebase

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Lua/LuaCsUpdateChecker.cs
+4 -4
View File
@@ -7,14 +7,14 @@ namespace Barotrauma
{
public static void Check()
{
if (!File.Exists(LuaSetup.VERSION_FILE)) { return; }
if (!File.Exists(LuaCsSetup.VERSION_FILE)) { return; }
ContentPackage luaCsPackage = LuaSetup.GetPackage();
ContentPackage luaCsPackage = LuaCsSetup.GetPackage();
string luaCsPath = Path.GetDirectoryName(luaCsPackage.Path);
if (luaCsPackage == null) { return; }
string clientVersion = File.ReadAllText(LuaSetup.VERSION_FILE);
string clientVersion = File.ReadAllText(LuaCsSetup.VERSION_FILE);
string workshopVersion = luaCsPackage.ModVersion;
if (clientVersion == workshopVersion) { return; }
@@ -39,7 +39,7 @@ namespace Barotrauma
File.Copy(Path.Combine(luaCsPath, "Binary", file), file, true);
}
File.WriteAllText(LuaSetup.VERSION_FILE, workshopVersion);
File.WriteAllText(LuaCsSetup.VERSION_FILE, workshopVersion);
}
catch (Exception e)
{
Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen.cs
+2 -2
View File
@@ -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())
{
Barotrauma/BarotraumaClient/ClientSource/Screens/ModDownloadScreen.cs
+2 -2
View File
@@ -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();
}
}
}
Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs
+2 -2
View File
@@ -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();