PSForever/GameLauncher
1
0
Fork 0
mirror of https://github.com/psforever/GameLauncher.git synced 2026-07-15 00:14:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix CoreCombat (/CC) and "extra" arguments missing when starting with launcher login.

Browse source 
Change some error messages.
This commit is contained in:
Resaec 2023-08-02 21:25:33 +02:00
parent ec0c4eb218
commit c64ff7f83a
1 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

37
PSLauncher/LauncherForm.cs
View file

@ -272,7 +272,7 @@ namespace PSLauncher
} }
else else
{ {
Launch(); Launch(arguments);
} }
return; return;
@ -314,18 +314,13 @@ namespace PSLauncher
} }
} }
void Launch() void Launch(List<string> _arguments)
{ {
startLaunching(); startLaunching();
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
// check file integrity if (!this.doLogin(_arguments))
});
Task.Factory.StartNew(() =>
{
if (!this.doLogin())
{ {
gameStopped(); gameStopped();
} }
@ -429,7 +424,7 @@ namespace PSLauncher
break; break;
default: default:
errorMessage = "Please report to this error to the PSF Support on Discord\nError: " + errorResponse.Status; errorMessage = "Please report this error to the PSF Support on Discord\nError: " + errorResponse.Status;
break; break;
} }
@ -467,7 +462,7 @@ namespace PSLauncher
} }
var result = respVersion.Content.ReadAsStringAsync().Result; var result = respVersion.Content.ReadAsStringAsync().Result;
var versionResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<VersionResponse>(result); var versionResponse = JsonConvert.DeserializeObject<VersionResponse>(result);
if (versionResponse.Status != 0) if (versionResponse.Status != 0)
{ {
@ -483,8 +478,8 @@ namespace PSLauncher
{ {
addLine("====="); addLine("=====");
addLine("Could not compare launcher versions. Launching may fail."); addLine("Could not compare launcher versions. Launching may fail.");
addLine(string.Format("Local version: {0} - latest version: {1}", localVersion, newestVersion)); addLine(string.Format("Local version: v{0} - latest version: v{1}", localVersion, newestVersion));
addLine("Please update if there is a newer PSF Launcher version."); addLine("Please update if there is a newer version of PSF Launcher.");
addLine("====="); addLine("=====");
return; return;
@ -562,7 +557,7 @@ namespace PSLauncher
} }
var result = respLogin.Content.ReadAsStringAsync().Result; var result = respLogin.Content.ReadAsStringAsync().Result;
var loginResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<TokenResponse>(result); var loginResponse = JsonConvert.DeserializeObject<TokenResponse>(result);
if (loginResponse.Status != 0) if (loginResponse.Status != 0)
{ {
@ -597,7 +592,7 @@ namespace PSLauncher
} }
var result = respValidateGet.Content.ReadAsStringAsync().Result; var result = respValidateGet.Content.ReadAsStringAsync().Result;
var validateGetResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<ValidationResponse>(result); var validateGetResponse = JsonConvert.DeserializeObject<ValidationResponse>(result);
if (validateGetResponse.Status != 0) if (validateGetResponse.Status != 0)
{ {
@ -679,7 +674,7 @@ namespace PSLauncher
} }
var result = respValidatePost.Content.ReadAsStringAsync().Result; var result = respValidatePost.Content.ReadAsStringAsync().Result;
var validatePostResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<TokenResponse>(result); var validatePostResponse = JsonConvert.DeserializeObject<TokenResponse>(result);
if (validatePostResponse.Status != 0) if (validatePostResponse.Status != 0)
{ {
@ -714,7 +709,7 @@ namespace PSLauncher
} }
var result = respGameToken.Content.ReadAsStringAsync().Result; var result = respGameToken.Content.ReadAsStringAsync().Result;
var gameTokenResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<GameTokenResponse>(result); var gameTokenResponse = JsonConvert.DeserializeObject<GameTokenResponse>(result);
if (gameTokenResponse.Status != 0) if (gameTokenResponse.Status != 0)
{ {
@ -728,7 +723,7 @@ namespace PSLauncher
return true; return true;
} }
bool doLogin() bool doLogin(List<string> _arguments)
{ {
string path = Settings.Default.PSPath; string path = Settings.Default.PSPath;
string psExe = Path.GetFullPath(Path.Combine(path, SettingsForm.PS_EXE_NAME)); string psExe = Path.GetFullPath(Path.Combine(path, SettingsForm.PS_EXE_NAME));
@ -802,13 +797,9 @@ namespace PSLauncher
return false; return false;
} }
string launch_args = "/K:" + gameToken; _arguments.Add("/K:" + gameToken);
string ExtraLaunchArgs = Settings.Default.ExtraArgs;
if (ExtraLaunchArgs != String.Empty) return startPlanetSide(psExe, path, String.Join(" ", _arguments));
launch_args += " " + ExtraLaunchArgs;
return startPlanetSide(psExe, path, launch_args);
} }
bool startPlanetSide(string exe, string workingDir, string args) bool startPlanetSide(string exe, string workingDir, string args)