[release] v1.0 Public Release

- ReloadOptions now fully supports ServerPerks + Vanilla
Bleeding-Action-Man · Apr 17, 2021 · 3f2d166 · 3f2d166
1 parent 1059d93
commit 3f2d166
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 150 deletions.
diff --git a/ReloadOptionsSP/Classes/ReloadOptionsSP.uc b/ReloadOptionsSP/Classes/ReloadOptionsSP.uc
@@ -40,14 +40,15 @@ function Mutate(string MutateString, PlayerController Sender) {
 
 /* Add the interaction. */
 simulated function Tick(float DeltaTime) {
-  local PlayerController localController;
+  local PlayerController PC;
+  local RldOptInteraction NewInteraction;
 
-  localController= Level.GetLocalPlayerController();
-  if (localController != none)
-  {
-    localController.Player.InteractionMaster.AddInteraction("ReloadOptionsSP.RldOptInteraction", localController.Player);
+  PC = Level.GetLocalPlayerController();
+  if (PC != None && !PC.PlayerReplicationInfo.bIsSpectator) {
+    NewInteraction = RldOptInteraction(PC.Player.InteractionMaster.AddInteraction("ReloadOptionsSP.RldOptInteraction", PC.Player));
+    NewInteraction.RegisterMutator(Self);
+    Disable('Tick');
   }
-  Disable('Tick');
 }
 
 defaultproperties

diff --git a/ReloadOptionsSP/Classes/RldOptInteraction.uc b/ReloadOptionsSP/Classes/RldOptInteraction.uc
@@ -7,7 +7,6 @@ var GUI.GUITabItem ReloadOpt_Tab;
 var config bool bAllowInterrupt, bDisableAuto, bNoAmmoMsg, bInterruptMsg, bNeedReloadMsg;
 var config array<string> InterruptAliases;
 var float timeReloaded, timeReceivedMessage;
-var string ReloadOptClass_SP;
 
 ///////////////////////////
 //		INTERACTION		//
@@ -32,7 +31,7 @@ function RegisterMutator(ReloadOptionsSP aMut) {
 
 function bool KeyEvent(EInputKey Key, EInputAction Action, float Delta) {
   local string Alias, Alias_SP, LeftPart, RigthPart;
-  local MidGamePanel panel;
+  local RldOptMidGameOptions panel;
   local UT2K4PlayerLoginMenu escMenu;
   local int i;
 
@@ -72,12 +71,10 @@ function bool KeyEvent(EInputKey Key, EInputAction Action, float Delta) {
           }
         escMenu= UT2K4PlayerLoginMenu(KFGUIController(ViewportOwner.GUIController).ActivePage);
         if (escMenu != none && escMenu.c_Main.TabIndex(ReloadOpt_Tab.caption) == -1) {
-          if (escMenu.IsA('SRInvasionLoginMenu')) {
-          ReloadOpt_Tab.ClassName = ReloadOptClass_SP;
-          }
-          panel= MidGamePanel(escMenu.c_Main.AddTabItem(ReloadOpt_Tab));
+          panel = RldOptMidGameOptions(escMenu.c_Main.AddTabItem(ReloadOpt_Tab));
           if (panel != none) {
           panel.ModifiedChatRestriction= escMenu.UpdateChatRestriction;
+          panel.MyInteraction = self;
           }
         }
       }
@@ -263,7 +260,6 @@ function InterruptReload(optional bool bFireAlias, optional bool bAltFireAlias)
 
 defaultproperties
 {
-   ReloadOptClass_SP="ReloadOptionsSP.RldOptMidGameOptions_SP"
    ReloadOpt_Tab=(ClassName="ReloadOptionsSP.RldOptMidGameOptions",Caption="Reload Options",Hint="Options to customize reload.")
    InterruptAliases(0)="Fire"
    InterruptAliases(1)="AltFire"

diff --git a/ReloadOptionsSP/Classes/RldOptMidGameOptions.uc b/ReloadOptionsSP/Classes/RldOptMidGameOptions.uc
@@ -1,4 +1,4 @@
-class RldOptMidGameOptions extends MidGamePanel DependsOn(ReloadOptionsSP);
+class RldOptMidGameOptions extends MidGamePanel;
 
 var RldOptInteraction MyInteraction;
 var automated GUISectionBackground i_BGCenter;
@@ -70,7 +70,7 @@ defaultproperties
    Begin Object Class=GUISectionBackground Name=BGCenter
      // bFillClient=True
      Caption="Reload Options"
-      WinTop=0.05
+      WinTop=0.03
       WinLeft=0.25
       WinWidth=0.5
       WinHeight=0.5

diff --git a/ReloadOptionsSP/Classes/RldOptMidGameOptions_SP.uc b/ReloadOptionsSP/Classes/RldOptMidGameOptions_SP.uc