1.2 Snapshot (7445.19279.1)

This commit is contained in:
Bitl 2020-05-20 10:45:56 -07:00
parent e2645b5d19
commit 0785aecac6
2 changed files with 3 additions and 4 deletions

View File

@ -918,8 +918,7 @@ public class LauncherFuncs
string result = ""; string result = "";
if (GlobalVars.GraphicsMode == 1) if (GlobalVars.GraphicsMode == 1)
{ {
result += "pcall(function() settings().Rendering.graphicsMode = 2 end);" result += "xpcall( function() settings().Rendering.graphicsMode = 2 end, function( err ) settings().Rendering.graphicsMode = 4 end );";
+ " pcall(function() if settings().Rendering.graphicsMode ~= 2 then settings().Rendering.graphicsMode = 4 end end);";
} }
else if(GlobalVars.GraphicsMode == 2) else if(GlobalVars.GraphicsMode == 2)
{ {

View File

@ -1415,8 +1415,8 @@ namespace NovetusLauncher
{ {
LauncherFuncs.ReloadLoadtextValue(); LauncherFuncs.ReloadLoadtextValue();
string luafile = "rbxasset://scripts\\\\CSView.lua"; string luafile = "rbxasset://scripts\\\\CSView.lua";
string mapfile = GlobalVars.ConfigDirData + "\\preview\\content\\fonts\\3DView.rbxl"; string mapfile = GlobalVars.BasePathLauncher + "\\preview\\content\\fonts\\3DView.rbxl";
string rbxexe = GlobalVars.ConfigDirData + "\\preview\\3DView.exe"; string rbxexe = GlobalVars.BasePathLauncher + "\\preview\\3DView.exe";
string quote = "\""; string quote = "\"";
string args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CS3DView(0,'Player'," + GlobalVars.loadtext + ");" + quote; string args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CS3DView(0,'Player'," + GlobalVars.loadtext + ");" + quote;
try try