C# Move corona commands in a common place

manups4e · Mar 3, 2024 · caf3360 · caf3360
1 parent 1023b25
commit caf3360
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/ScaleformUI_Csharp/Menus/Pause Menus/LobbyMenu/MainView.cs b/ScaleformUI_Csharp/Menus/Pause Menus/LobbyMenu/MainView.cs
@@ -476,25 +476,12 @@ public override void Draw()
         {
             if (!Visible || TemporarilyHidden || isBuilding) return;
             Minimap.MaintainMap();
-            BeginScaleformMovieMethodOnFrontend("INSTRUCTIONAL_BUTTONS");
-            ScaleformMovieMethodAddParamPlayerNameString("SET_DATA_SLOT_EMPTY");
-            EndScaleformMovieMethod();
             base.Draw();
             _pause.Draw(true);
             if (_firstDrawTick)
             {
                 _pause._lobby.CallFunction("FADE_IN");
                 _firstDrawTick = false;
-                timer = GetNetworkTime();
-            }
-            if (Main.GameTime - timer < 150)
-            {
-                BeginScaleformMovieMethodOnFrontendHeader("SHOW_MENU");
-                ScaleformMovieMethodAddParamBool(false);
-                EndScaleformMovieMethod();
-                BeginScaleformMovieMethodOnFrontendHeader("SHOW_HEADING_DETAILS");
-                ScaleformMovieMethodAddParamBool(false);
-                EndScaleformMovieMethod();
             }
         }
 

diff --git a/ScaleformUI_Csharp/Menus/Pause Menus/PauseMenu/TabView.cs b/ScaleformUI_Csharp/Menus/Pause Menus/PauseMenu/TabView.cs
@@ -538,8 +538,6 @@ internal async void buildStore(PlayerListTab tab)
         public override void Draw()
         {
             if (!Visible || TemporarilyHidden || isBuilding) return;
-            BeginScaleformMovieMethodOnFrontend("INSTRUCTIONAL_BUTTONS");
-            ScaleformMovieMethodAddParamPlayerNameString("SET_DATA_SLOT_EMPTY");
             if (Tabs[Index] is PlayerListTab tab)
             {
                 tab.Minimap.MaintainMap();
@@ -553,12 +551,6 @@ public override void Draw()
                 _firstDrawTick = false;
                 timer = GetNetworkTime();
             }
-            BeginScaleformMovieMethodOnFrontendHeader("SHOW_MENU");
-            ScaleformMovieMethodAddParamBool(false);
-            EndScaleformMovieMethod();
-            BeginScaleformMovieMethodOnFrontendHeader("SHOW_HEADING_DETAILS");
-            ScaleformMovieMethodAddParamBool(false);
-            EndScaleformMovieMethod();
         }
 
         private void UpdateKeymapItems()

diff --git a/ScaleformUI_Csharp/Scaleforms/PauseMenu/PauseMenuScaleform.cs b/ScaleformUI_Csharp/Scaleforms/PauseMenu/PauseMenuScaleform.cs
@@ -262,6 +262,15 @@ public void Draw(bool isLobby = false)
         {
             if (_visible && GetCurrentFrontendMenuVersion() == GetHashKey("FE_MENU_VERSION_CORONA"))
             {
+                BeginScaleformMovieMethodOnFrontend("INSTRUCTIONAL_BUTTONS");
+                ScaleformMovieMethodAddParamPlayerNameString("SET_DATA_SLOT_EMPTY");
+                EndScaleformMovieMethod();
+                BeginScaleformMovieMethodOnFrontendHeader("SHOW_MENU");
+                ScaleformMovieMethodAddParamBool(false);
+                EndScaleformMovieMethod();
+                BeginScaleformMovieMethodOnFrontendHeader("SHOW_HEADING_DETAILS");
+                ScaleformMovieMethodAddParamBool(false);
+                EndScaleformMovieMethod();
                 SetScriptGfxDrawBehindPausemenu(true);
                 if (BGEnabled)
                 {