more oops

This commit is contained in:
Bitl 2020-03-26 09:14:09 -07:00
parent 4843b5da70
commit 3ca0fcf457
2 changed files with 37 additions and 33 deletions

View File

@ -499,7 +499,7 @@ public class LauncherFuncs
ReloadLoadtextValue(); ReloadLoadtextValue();
} }
public static void ReShadeValues(string cfgpath, bool write) public static void ReShadeValues(string cfgpath, bool write, bool setglobals)
{ {
if (write) if (write)
{ {
@ -546,31 +546,34 @@ public class LauncherFuncs
ini.IniWriteValue(section, "PerformanceMode", PerformanceMode.ToString()); ini.IniWriteValue(section, "PerformanceMode", PerformanceMode.ToString());
} }
if (Convert.ToInt32(Decryptline1) == 0) if (setglobals)
{ {
GlobalVars.ReShade = true; if (Convert.ToInt32(Decryptline1) == 0)
} {
else if (Convert.ToInt32(Decryptline1) == 1) GlobalVars.ReShade = true;
{ }
GlobalVars.ReShade = false; else if (Convert.ToInt32(Decryptline1) == 1)
} {
GlobalVars.ReShade = false;
}
if (Convert.ToInt32(Decryptline2) == 1 && Convert.ToInt32(Decryptline3) == 1) if (Convert.ToInt32(Decryptline2) == 1 && Convert.ToInt32(Decryptline3) == 1)
{ {
GlobalVars.ReShadeFPSDisplay = true; GlobalVars.ReShadeFPSDisplay = true;
} }
else if (Convert.ToInt32(Decryptline2) == 0 && Convert.ToInt32(Decryptline3) == 0) else if (Convert.ToInt32(Decryptline2) == 0 && Convert.ToInt32(Decryptline3) == 0)
{ {
GlobalVars.ReShadeFPSDisplay = false; GlobalVars.ReShadeFPSDisplay = false;
} }
if (Convert.ToInt32(Decryptline4) == 1) if (Convert.ToInt32(Decryptline4) == 1)
{ {
GlobalVars.ReShadePerformanceMode = true; GlobalVars.ReShadePerformanceMode = true;
} }
else if (Convert.ToInt32(Decryptline4) == 0) else if (Convert.ToInt32(Decryptline4) == 0)
{ {
GlobalVars.ReShadePerformanceMode = false; GlobalVars.ReShadePerformanceMode = false;
}
} }
} }
} }
@ -582,11 +585,11 @@ public class LauncherFuncs
if (!File.Exists(fullpath)) if (!File.Exists(fullpath))
{ {
File.Copy(GlobalVars.ConfigDir + "\\ReShade_default.ini", fullpath, true); File.Copy(GlobalVars.ConfigDir + "\\ReShade_default.ini", fullpath, true);
ReShadeValues(fullpath, write); ReShadeValues(fullpath, write, true);
} }
else else
{ {
ReShadeValues(fullpath, write); ReShadeValues(fullpath, write, true);
} }
string clientdir = GlobalVars.ClientDir; string clientdir = GlobalVars.ClientDir;
@ -599,10 +602,11 @@ public class LauncherFuncs
if (!File.Exists(fulldirpath)) if (!File.Exists(fulldirpath))
{ {
File.Copy(fullpath, fulldirpath, true); File.Copy(fullpath, fulldirpath, true);
ReShadeValues(fulldirpath, write, false);
} }
else else
{ {
ReShadeValues(fulldirpath, write); ReShadeValues(fulldirpath, write, false);
} }
} }
} }

View File

@ -540,7 +540,7 @@ namespace NovetusLauncher
// label24 // label24
// //
this.label24.AutoSize = true; this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(385, 14); this.label24.Location = new System.Drawing.Point(365, 7);
this.label24.Name = "label24"; this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(60, 13); this.label24.Size = new System.Drawing.Size(60, 13);
this.label24.TabIndex = 52; this.label24.TabIndex = 52;
@ -549,7 +549,7 @@ namespace NovetusLauncher
// label23 // label23
// //
this.label23.AutoSize = true; this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(220, 14); this.label23.Location = new System.Drawing.Point(200, 7);
this.label23.Name = "label23"; this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(92, 13); this.label23.Size = new System.Drawing.Size(92, 13);
this.label23.TabIndex = 51; this.label23.TabIndex = 51;
@ -573,7 +573,7 @@ namespace NovetusLauncher
// //
// button7 // button7
// //
this.button7.Location = new System.Drawing.Point(415, 56); this.button7.Location = new System.Drawing.Point(395, 49);
this.button7.Name = "button7"; this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(51, 21); this.button7.Size = new System.Drawing.Size(51, 21);
this.button7.TabIndex = 48; this.button7.TabIndex = 48;
@ -583,7 +583,7 @@ namespace NovetusLauncher
// //
// button11 // button11
// //
this.button11.Location = new System.Drawing.Point(364, 56); this.button11.Location = new System.Drawing.Point(344, 49);
this.button11.Name = "button11"; this.button11.Name = "button11";
this.button11.Size = new System.Drawing.Size(45, 21); this.button11.Size = new System.Drawing.Size(45, 21);
this.button11.TabIndex = 46; this.button11.TabIndex = 46;
@ -593,7 +593,7 @@ namespace NovetusLauncher
// //
// numericUpDown1 // numericUpDown1
// //
this.numericUpDown1.Location = new System.Drawing.Point(364, 30); this.numericUpDown1.Location = new System.Drawing.Point(344, 23);
this.numericUpDown1.Maximum = new decimal(new int[] { this.numericUpDown1.Maximum = new decimal(new int[] {
65535, 65535,
0, 0,
@ -626,7 +626,7 @@ namespace NovetusLauncher
// //
// button10 // button10
// //
this.button10.Location = new System.Drawing.Point(203, 56); this.button10.Location = new System.Drawing.Point(183, 49);
this.button10.Name = "button10"; this.button10.Name = "button10";
this.button10.Size = new System.Drawing.Size(120, 21); this.button10.Size = new System.Drawing.Size(120, 21);
this.button10.TabIndex = 15; this.button10.TabIndex = 15;
@ -657,7 +657,7 @@ namespace NovetusLauncher
// //
// textBox1 // textBox1
// //
this.textBox1.Location = new System.Drawing.Point(169, 30); this.textBox1.Location = new System.Drawing.Point(149, 23);
this.textBox1.Name = "textBox1"; this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(189, 20); this.textBox1.Size = new System.Drawing.Size(189, 20);
this.textBox1.TabIndex = 0; this.textBox1.TabIndex = 0;