diff --git a/FunkeySelector.sln b/FunkeySelector.sln
index a61a4ed..60b12a9 100644
--- a/FunkeySelector.sln
+++ b/FunkeySelector.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.421
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30413.136
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FunkeySelector", "FunkeySelector\FunkeySelector.csproj", "{387CDF2B-2CC3-491D-B1C2-CE436B23BF86}"
EndProject
diff --git a/FunkeySelector/App.config b/FunkeySelector/App.config
index 9463632..5f146c1 100644
--- a/FunkeySelector/App.config
+++ b/FunkeySelector/App.config
@@ -22,6 +22,9 @@
False
+
+ True
+
diff --git a/FunkeySelector/Form1.cs b/FunkeySelector/Form1.cs
index 1d48c4a..a563dae 100644
--- a/FunkeySelector/Form1.cs
+++ b/FunkeySelector/Form1.cs
@@ -33,7 +33,10 @@ public Form1() //When the form is opened.
{
if (!File.Exists("UBFunkeys.exe")) //Checks if it's in the RadicaGame folder.
{
- MessageBox.Show("The U.B. Funkeys game was not found! Did you put FunkeySelectorGUI in the RadicaGame folder?");
+ if (!File.Exists("OpenFK.exe")) //Ensures that OpenFK users won't get warned.
+ {
+ MessageBox.Show("The U.B. Funkeys game was not found! Did you put FunkeySelectorGUI in the RadicaGame folder?");
+ }
}
}
if (Properties.Settings.Default.disableModCheck == false) // Checks if mod check is allowed.
@@ -42,7 +45,11 @@ public Form1() //When the form is opened.
{
if (CalculateMD5("Main.swf") != "93261ce3dc332fdee5d4335eab0a8e63") //Compares the MD5 hash of the local main.swf with the mod's main.swf.
{
- MessageBox.Show("Could not detect the Funkeys Selection Mod! Did you install the mod?");
+ if (File.Exists("OpenFK.exe")) //Ensures that OpenFK users won't get warned.
+ {
+ Debug.WriteLine("OpenFK detected! Skipping mod check.");
+ }
+ else MessageBox.Show("Could not detect the Funkeys Selection Mod! Did you install the mod?");
}
}
}
diff --git a/FunkeySelector/Form14.Designer.cs b/FunkeySelector/Form14.Designer.cs
index 8644473..5bd9f6f 100644
--- a/FunkeySelector/Form14.Designer.cs
+++ b/FunkeySelector/Form14.Designer.cs
@@ -75,7 +75,7 @@ private void InitializeComponent()
this.checkBox1.BackColor = System.Drawing.Color.Transparent;
this.checkBox1.Font = new System.Drawing.Font("Comic Sans MS", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBox1.ForeColor = System.Drawing.SystemColors.ControlLightLight;
- this.checkBox1.Location = new System.Drawing.Point(110, 85);
+ this.checkBox1.Location = new System.Drawing.Point(111, 66);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(351, 24);
this.checkBox1.TabIndex = 2;
@@ -89,7 +89,7 @@ private void InitializeComponent()
this.checkBox2.BackColor = System.Drawing.Color.Transparent;
this.checkBox2.Font = new System.Drawing.Font("Comic Sans MS", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBox2.ForeColor = System.Drawing.SystemColors.ControlLightLight;
- this.checkBox2.Location = new System.Drawing.Point(110, 108);
+ this.checkBox2.Location = new System.Drawing.Point(111, 89);
this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(297, 24);
this.checkBox2.TabIndex = 3;
@@ -103,7 +103,7 @@ private void InitializeComponent()
this.checkBox3.BackColor = System.Drawing.Color.Transparent;
this.checkBox3.Font = new System.Drawing.Font("Comic Sans MS", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBox3.ForeColor = System.Drawing.SystemColors.ControlLightLight;
- this.checkBox3.Location = new System.Drawing.Point(110, 154);
+ this.checkBox3.Location = new System.Drawing.Point(111, 135);
this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(257, 24);
this.checkBox3.TabIndex = 4;
@@ -117,7 +117,7 @@ private void InitializeComponent()
this.checkBox4.BackColor = System.Drawing.Color.Transparent;
this.checkBox4.Font = new System.Drawing.Font("Comic Sans MS", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBox4.ForeColor = System.Drawing.SystemColors.ControlLightLight;
- this.checkBox4.Location = new System.Drawing.Point(110, 131);
+ this.checkBox4.Location = new System.Drawing.Point(111, 112);
this.checkBox4.Name = "checkBox4";
this.checkBox4.Size = new System.Drawing.Size(194, 24);
this.checkBox4.TabIndex = 5;
@@ -132,7 +132,7 @@ private void InitializeComponent()
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("Comic Sans MS", 11.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.button2.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.button2.Location = new System.Drawing.Point(154, 184);
+ this.button2.Location = new System.Drawing.Point(146, 187);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(262, 31);
this.button2.TabIndex = 6;
diff --git a/FunkeySelector/Form14.cs b/FunkeySelector/Form14.cs
index 67fabb0..c7e2107 100644
--- a/FunkeySelector/Form14.cs
+++ b/FunkeySelector/Form14.cs
@@ -30,8 +30,6 @@ private void checkBox1_CheckedChanged(object sender, EventArgs e)
else
Properties.Settings.Default.disableModCheck = false;
Properties.Settings.Default.Save();
-
-
}
private void checkBox2_CheckedChanged(object sender, EventArgs e)
diff --git a/FunkeySelector/FunkeySelector.csproj b/FunkeySelector/FunkeySelector.csproj
index 8f424d9..246dde7 100644
--- a/FunkeySelector/FunkeySelector.csproj
+++ b/FunkeySelector/FunkeySelector.csproj
@@ -14,6 +14,8 @@
true
+
+
AnyCPU
@@ -28,7 +30,7 @@
AnyCPU
- pdbonly
+ none
true
bin\Release\
TRACE
@@ -42,6 +44,8 @@
+
+
diff --git a/FunkeySelector/Program.cs b/FunkeySelector/Program.cs
index c61f2a0..f7b2bd1 100644
--- a/FunkeySelector/Program.cs
+++ b/FunkeySelector/Program.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Windows.Forms;
diff --git a/FunkeySelector/Properties/Settings.Designer.cs b/FunkeySelector/Properties/Settings.Designer.cs
index 6f52a0f..2c6c856 100644
--- a/FunkeySelector/Properties/Settings.Designer.cs
+++ b/FunkeySelector/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace FunkeySelector.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -70,5 +70,17 @@ public bool disableWineCheck {
this["disableWineCheck"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
+ public bool updates {
+ get {
+ return ((bool)(this["updates"]));
+ }
+ set {
+ this["updates"] = value;
+ }
+ }
}
}
diff --git a/FunkeySelector/Properties/Settings.settings b/FunkeySelector/Properties/Settings.settings
index 93f00ec..8979c60 100644
--- a/FunkeySelector/Properties/Settings.settings
+++ b/FunkeySelector/Properties/Settings.settings
@@ -14,5 +14,8 @@
False
+
+ True
+
\ No newline at end of file