From 74700d7f204e8e2f25651e1241072385a6f29a9b Mon Sep 17 00:00:00 2001
From: Shtoyan <shtoyan@yahoo.com>
Date: Thu, 3 Mar 2022 15:07:18 +0400
Subject: [PATCH] mutator code cleanup

---
 sources/NiceGameType.uc         |  5 +++++
 sources/NicePack.uc             | 19 +++++++------------
 sources/NicePlayerController.uc |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/sources/NiceGameType.uc b/sources/NiceGameType.uc
index aeb6572..ca0aaa7 100644
--- a/sources/NiceGameType.uc
+++ b/sources/NiceGameType.uc
@@ -325,6 +325,11 @@ defaultproperties
 {
     GameName="Nice Floor"
     Description="Nice Edition of ScrN Killing Floor game mode (ScrnGameType)."
+    // custom player controller
+    PlayerControllerClass=class'NicePlayerController'
+    PlayerControllerClassName="NicePack.NicePlayerController"
+    // skills menu
+    LoginMenuClass="NicePack.NiceInvasionLoginMenu"
     ZedTimeSlomoScale=0.4
     LesserZedTimeSlomoScale=0.6
 }
\ No newline at end of file
diff --git a/sources/NicePack.uc b/sources/NicePack.uc
index 8260514..29fc08a 100644
--- a/sources/NicePack.uc
+++ b/sources/NicePack.uc
@@ -188,25 +188,20 @@ simulated function PostBeginPlay()
     // Find game type and ScrN mutator
     ScrnGT = ScrnGameType(Level.Game); 
     NiceGT = NiceGameType(Level.Game);
-    if(ScrnGT == none){
-       Log("ERROR: Wrong GameType (requires at least ScrnGameType)", Class.Outer.Name);
+    if (NiceGT == none)
+    {
+       Log("ERROR: Wrong GameType (requires NiceGameType)", class.Outer.Name);
        Destroy();
        return;
     }
-    // Skills menu
-    ScrnGT.LoginMenuClass = string(class'NiceInvasionLoginMenu');
-    if(NiceGT != none)
-       NiceGT.RegisterMutator(Self);
-    ScrnMut = ScrnGT.ScrnBalanceMut;
+    // FIXME poosh forces this variable in his mutator...
+    NiceGT.LoginMenuClass = "NicePack.NiceInvasionLoginMenu";
+    NiceGT.RegisterMutator(self);
+    ScrnMut = NiceGT.ScrnBalanceMut;
     if(bReplacePickups)
        ScrnMut.bReplacePickups = false;
     // Replication of some variables
     SetReplicationData();
-    // New player controller class
-    if(!ClassIsChildOf(ScrnGT.PlayerControllerClass, class'NicePlayerController')){
-       ScrnGT.PlayerControllerClass = class'NicePlayerController';
-       ScrnGT.PlayerControllerClassName = string(class'NicePlayerController');
-    }
     // Game rules
     GameRules = Spawn(class'NiceRules', self);
     // -- Lower starting HL
diff --git a/sources/NicePlayerController.uc b/sources/NicePlayerController.uc
index 7b67034..00e8fae 100644
--- a/sources/NicePlayerController.uc
+++ b/sources/NicePlayerController.uc
@@ -1537,6 +1537,7 @@ function ClientLocationalVoiceMessage(PlayerReplicationInfo Sender,
 
 defaultproperties
 {
+    MidGameMenuClass="NicePack.NiceInvasionLoginMenu"
      nicePlayerInfoVersionNumber=1
      bAltSwitchesModes=True
      bAdvReloadCheck=True