fix endgame restart crash

hmxmilohax · Sep 22, 2023 · 59bb85c · 59bb85c
1 parent 2d9cdea
commit 59bb85c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 33 deletions.
diff --git a/_ark/ui/game.dta b/_ark/ui/game.dta
@@ -50,7 +50,6 @@
          {{gamemode get game_panel}
             setup}})
    (intro_start
-      ;DX_GAME_RESET_HANDLER
       {{gamemode get game_screen}
          set_showing
          TRUE}
@@ -64,7 +63,6 @@
                ($this intro_end)})}
       kDataUnhandled)
    (intro_skip
-      ;DX_GAME_RESET_HANDLER
       {{gamemode get game_screen}
          set_showing
          TRUE}
@@ -246,7 +244,9 @@
    (file
       "../world/world.milo")
    (unload_async TRUE)
-   #ifndef HX_WII (enter {world_panel set_showing {!{== $dx_venue none}}}) #endif
+   (enter
+      {world_panel set_showing {!{== $dx_venue none}}}
+   )
    (unload
       {if
          $bandwardrobe
@@ -255,7 +255,8 @@
 #define GAME_SCREEN_HANDLERS
 ((disable_screen_saver TRUE)
    PAUSE_ON_MIC_DISCONNECT
-   (enter DX_PRESENCE_MANGER
+   (enter
+      DX_PRESENCE_MANGER
       {set $dx_game_enter_count
          {+ $dx_game_enter_count 1}
       }
@@ -265,14 +266,11 @@
       {dx_log_writer FALSE {sprint "Game has been entered. Game enter count: " $dx_game_enter_count} " - Gamemode: " $dx_gamemode " - Local: " {session_mgr is_local}}
       DX_AUTOPLAYER_HANDLER
       DX_GAME_RESET_HANDLER
-      ;DX_MTV_RESET_HANDLER
       {dx_log_writer FALSE {sprint "Current User Info - Song Speed: " $speedmod " - Trackspeed: " $trackspeed " - Venue FPS: " $emulatefps " - Venue: " $dx_venue " - Venue Forced: " $force}}
       {dx_log_writer FALSE {sprint "Current User Textures - Emissive: " $dx_overdrive_guitar " - Highway: " $dx_highway_guitar " - Spotlight: " $dx_streak_guitar  " - Keyboard: " $dx_keyboard " - Smasher: " $dx_smasher " - Gem: " $dx_gem " - Sustain: " $dx_sustain " - Crowd Meter Tex: " $dx_crowd_meter}}
       {dx_log_writer TRUE {sprint "Current User Textures cont. - OD Bar: " $dx_overdrive_bar  " - Multiplier Ring: " $dx_multiplier_ring " - Track Rails: " $dx_rails " - Score Tex: " $dx_score " - Flames: " $dx_flames " - Vox Arrow: " $dx_vocal_arrow " - Vox Highway: " $dx_vocal_highway " - DX Multi Angle: " $dx_multiangle}}
-      #ifndef HX_WII
       {game set_kick_autoplay {modifier_mgr is_modifier_active mod_auto_kick}} ; dx - auto kick
       {gamemode set allow_drum_fills {! {modifier_mgr is_modifier_active mod_static_fills}}} ; dx - static fills
-      #endif
       {$this set_showing TRUE}
       {set
          [delayed_mic_check]
@@ -304,7 +302,7 @@
       DX_LEADER_SPEED_SETTER
       DX_CURRENT_SONG_CLEAR
       DX_JSON_CLEAR
-      DX_MTV_RESET_HANDLER
+      ;DX_MTV_RESET_HANDLER
       {platform_mgr remove_sink $this ui_changed}
       {platform_mgr remove_sink $this microphones_changed}
       {synth stop_playback_all_mics}
@@ -360,8 +358,6 @@
             unload}})}
 #define GAME_SCREEN_PANELS
 (game world_panel coop_track_panel sync_audio_net_panel)
-#define GAME_SCREEN_PANELS_NO_TRACK
-(world_panel game sync_audio_net_panel)
 {new
    BandScreen
    game_screen
@@ -426,7 +422,7 @@
 {new
    BandScreen
    restart_game_screen
-   (panels #ifdef HX_WII GAME_SCREEN_PANELS_NO_TRACK #else GAME_SCREEN_PANELS #endif sync_audio_net_screen_panel)
+   (panels GAME_SCREEN_PANELS sync_audio_net_screen_panel)
    (load_panels
       {overshell set_active_status kOvershellInactive}
       {$this set_showing FALSE})
@@ -574,15 +570,6 @@
       {print
          "\n\nVOCAL SCORE SONG DONE!\n"}
       {exit})}
-#ifdef HX_WII
-{new
-   UIPanel
-   mydta_start_in_game_panel
-   (load
-      {content_mgr start_refresh})
-   (is_loaded
-      {content_mgr refresh_done})}
-#else
 {new
    UIPanel
    mydta_start_in_game_panel
@@ -615,26 +602,15 @@
                   done}
                {{ui current_screen}
                   ready_for_game}})})}
-#endif
 {new
    BandScreen
    mydta_start_in_game_screen
    (panels mydta_start_in_game_panel)
-   #ifdef HX_WII
-   (TRANSITION_COMPLETE_MSG
-      {ui goto_screen preloading_screen})
-   #else
    (ready_for_game
-      {ui goto_screen preloading_screen})
-   #endif}
+      {ui goto_screen preloading_screen})}
 {new
    BandScreen
    mydta_start_practice_in_game_screen
    (panels mydta_start_in_game_panel)
-   #ifdef HX_WII
-   (TRANSITION_COMPLETE_MSG
-      {ui goto_screen practice_game_screen})
-   #else
    (ready_for_game
-      {ui goto_screen practice_game_screen})
-   #endif}
+      {ui goto_screen practice_game_screen})}
diff --git a/_ark/ui/init.dta b/_ark/ui/init.dta
@@ -1,3 +1,4 @@
+{profile_mgr set_overscan TRUE}
 #include ../dx/ui/dx_funcs.dta
 #include ../dx/ui/dx_ui_init.dta
 #ifdef UI_INIT_DTA