From 3837416014f617e6fa4d97d9e65eeeb79c282e05 Mon Sep 17 00:00:00 2001 From: Jonathan Bayer Date: Sun, 18 Jun 2023 10:09:10 -0400 Subject: [PATCH] Removed statics from toggles (was unnecessary) --- EditorExtensionsRedux/AssemblyVersion.cs | 4 ++-- EditorExtensionsRedux/EditorExtensionsRedux.cs | 11 ++++------- .../EditorExtensionsRedux.version | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/EditorExtensionsRedux/AssemblyVersion.cs b/EditorExtensionsRedux/AssemblyVersion.cs index b287e50..3bc8334 100644 --- a/EditorExtensionsRedux/AssemblyVersion.cs +++ b/EditorExtensionsRedux/AssemblyVersion.cs @@ -10,5 +10,5 @@ using System.Reflection; - [assembly: AssemblyVersion("3.4.3.6")] - [assembly: AssemblyFileVersion("3.4.3.6")] \ No newline at end of file + [assembly: AssemblyVersion("3.4.4.0")] + [assembly: AssemblyFileVersion("3.4.4.0")] \ No newline at end of file diff --git a/EditorExtensionsRedux/EditorExtensionsRedux.cs b/EditorExtensionsRedux/EditorExtensionsRedux.cs index 5c815d9..220abb5 100644 --- a/EditorExtensionsRedux/EditorExtensionsRedux.cs +++ b/EditorExtensionsRedux/EditorExtensionsRedux.cs @@ -737,11 +737,10 @@ void localdumpReflection() #endif //Boop: Cache the editor hotkeys so we can keep consistency with whatever is in the settings.cfg file. - internal static KeyCodeExtended HotkeyEditor_toggleSymModePrimary; // = GameSettings.Editor_toggleSymMode.primary; - internal static KeyCodeExtended HotkeyEditor_toggleSymModeSecondary; // = GameSettings.Editor_toggleSymMode.secondary; - internal static KeyCodeExtended HotkeyEditor_toggleAngleSnapPrimary; // = GameSettings.Editor_toggleAngleSnap.primary; - internal static KeyCodeExtended HotkeyEditor_toggleAngleSnapSecondary;// = GameSettings.Editor_toggleAngleSnap.secondary; - internal static bool hotkeysInitted = false; + internal KeyCodeExtended HotkeyEditor_toggleSymModePrimary; // = GameSettings.Editor_toggleSymMode.primary; + internal KeyCodeExtended HotkeyEditor_toggleSymModeSecondary; // = GameSettings.Editor_toggleSymMode.secondary; + internal KeyCodeExtended HotkeyEditor_toggleAngleSnapPrimary; // = GameSettings.Editor_toggleAngleSnap.primary; + internal KeyCodeExtended HotkeyEditor_toggleAngleSnapSecondary;// = GameSettings.Editor_toggleAngleSnap.secondary; //Unity, called after Awake() public void Start() @@ -750,13 +749,11 @@ public void Start() Log.Debug("Version: " + Versioning.Revision); //Boop: Cache the editor hotkeys so we can keep consistency with whatever is in the settings.cfg file. - if (!hotkeysInitted) { HotkeyEditor_toggleSymModePrimary = GameSettings.Editor_toggleSymMode.primary; HotkeyEditor_toggleSymModeSecondary = GameSettings.Editor_toggleSymMode.secondary; HotkeyEditor_toggleAngleSnapPrimary = GameSettings.Editor_toggleAngleSnap.primary; HotkeyEditor_toggleAngleSnapSecondary = GameSettings.Editor_toggleAngleSnap.secondary; - hotkeysInitted = true; } //Boop: Nuke the editor hotkeys so we can hijack them. diff --git a/GameData/EditorExtensionsRedux/EditorExtensionsRedux.version b/GameData/EditorExtensionsRedux/EditorExtensionsRedux.version index b22c071..43acb87 100644 --- a/GameData/EditorExtensionsRedux/EditorExtensionsRedux.version +++ b/GameData/EditorExtensionsRedux/EditorExtensionsRedux.version @@ -5,8 +5,8 @@ "VERSION": { "MAJOR": 3, "MINOR": 4, - "PATCH": 3, - "BUILD": 6 + "PATCH": 4, + "BUILD": 0 }, "KSP_VERSION": { "MAJOR": 1,