Remove unnecessary GUIController hook

(just handle in PlayerInput instead - may resolve AntiTCC issues)
alexstrout · Jan 17, 2021 · a3ffefd · a3ffefd
1 parent 72d5e00
commit a3ffefd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/Classes/foxPlayerInput.uc b/Classes/foxPlayerInput.uc
@@ -58,6 +58,10 @@ event PlayerInput(float DeltaTime)
 		//Write settings to ini if first run
 		SaveConfig();
 
+		//Just hook our custom UT2K4SettingsPage tabs here
+		class'UT2K4SettingsPage'.default.PanelClass[2] = "foxWSFix.foxUT2K4Tab_PlayerSettings";
+		class'UT2K4SettingsPage'.default.PanelClass[4] = "foxWSFix.foxUT2K4Tab_IForceSettings";
+
 		//Attempt to load widescreen HUDs (if not already done)
 		LoadWideHUD();
 		return;

diff --git a/Classes/foxUT2K4GUIController.uc b/Classes/foxUT2K4GUIController.uc
@@ -1,6 +1,6 @@
+//Dummied out GUIController, kept in for compatibility with existing foxWSFix v2.0 installs
+//This used to just set MainMenuOptions(5)="foxWSFix.foxUT2K4SettingsPage"
+//However, specific menu overrides are now handled directly in foxPlayerInput
 class foxUT2K4GUIController extends UT2K4GUIController;
 
-defaultproperties
-{
-	MainMenuOptions(5)="foxWSFix.foxUT2K4SettingsPage"
-}
+//Do nothing and just be a UT2K4GUIController
diff --git a/Classes/foxUT2K4SettingsPage.uc b/Classes/foxUT2K4SettingsPage.uc