practice crash fix

hmxmilohax · Nov 28, 2024 · 7721981 · 7721981
1 parent 0b5aabf
commit 7721981
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/_ark/dx/track/hud_ui/dx_hud_ui_funcs.dta b/_ark/dx/track/hud_ui/dx_hud_ui_funcs.dta
@@ -359,7 +359,7 @@
 {func
    dx_new_set_song_progress_backer
    ($enabled)
-   {if {&& {! $enabled} $dx_mtvup {! {gamemode in_mode trainer}}}
+   {if {&& {! $enabled} $dx_mtvup {! {gamemode in_mode practice}} {! {gamemode in_mode trainer}}}
       {set_this {coop_track_panel find scoreboard}}
       {dx_song_progress_label.lbl set_token_fmt os_blnk}
       {dx_song_progress_label_needle.lbl set_token_fmt os_blnk}
@@ -371,7 +371,7 @@
       {dx_song_progress_instrument_label.lbl set_token_fmt os_blnk}
    }
    #ifndef HX_WII
-   {if {&& $enabled $dx_mtvup {! {gamemode in_mode trainer}}}
+   {if {&& $enabled $dx_mtvup {! {gamemode in_mode practice}} {! {gamemode in_mode trainer}}}
       {set_this {coop_track_panel find scoreboard}}
       {do
          ($total_beat $dx_end_of_song)
@@ -463,7 +463,7 @@
 {func
    dx_new_set_song_progress
    ($enabled)
-   {if {&& {! $enabled} $dx_mtvup {! {gamemode in_mode trainer}}}
+   {if {&& {! $enabled} $dx_mtvup {! {gamemode in_mode practice}} {! {gamemode in_mode trainer}}}
       {set_this {coop_track_panel find scoreboard}}
       {dx_song_progress_label.lbl set_token_fmt os_blnk}
       {dx_song_progress_label_needle.lbl set_token_fmt os_blnk}
@@ -474,7 +474,7 @@
       {dx_song_progress_label_back_border.lbl set_token_fmt os_blnk}
       {dx_song_progress_instrument_label.lbl set_token_fmt os_blnk}
    }
-   {if {&& $enabled $dx_mtvup {! {gamemode in_mode trainer}}}
+   {if {&& $enabled $dx_mtvup {! {gamemode in_mode practice}} {! {gamemode in_mode trainer}}}
       {set_this {coop_track_panel find scoreboard}}
       {set $curr_beat {dx_get_current_beat}}
       {set $total_beat $dx_end_of_song}

diff --git a/_ark/dx/track/track/dx_track_panel_handles.dta b/_ark/dx/track/track/dx_track_panel_handles.dta
@@ -108,15 +108,17 @@
          {$this dx_force_remote_vox}
          ; reset texts and hide them
          {dx_game_hud_label dx_hud_label_time_remaining $dx_hud_time_remaining_text_size $dx_hud_time_remaining_text_font $dx_hud_time_remaining_text_alignment $dx_hud_time_remaining_text_kerning $dx_hud_time_remaining_text_x $dx_hud_time_remaining_text_z $dx_hud_time_remaining_text_y $dx_hud_time_remaining_text_r $dx_hud_time_remaining_text_g $dx_hud_time_remaining_text_b TRUE}
-         {dx_song_progress_label dx_song_progress_label_back_border TRUE}
-         {dx_song_progress_label dx_song_progress_label_back TRUE}
-         {dx_song_progress_label dx_song_progress_label_solo TRUE}
-         {dx_song_progress_label dx_song_progress_label_overdrive TRUE}
-         {dx_song_progress_label dx_song_progress_label_bre TRUE}
-         {dx_song_progress_label dx_song_progress_label_needle TRUE}
-         {dx_song_progress_label dx_song_progress_label TRUE}
-         {dx_get_this_countdown_array}
-         {dx_song_progress_instrument_label dx_song_progress_instrument_label TRUE}
+         {if {&& {! {gamemode in_mode practice}} {! {gamemode in_mode trainer}}}
+            {dx_song_progress_label dx_song_progress_label_back_border TRUE}
+            {dx_song_progress_label dx_song_progress_label_back TRUE}
+            {dx_song_progress_label dx_song_progress_label_solo TRUE}
+            {dx_song_progress_label dx_song_progress_label_overdrive TRUE}
+            {dx_song_progress_label dx_song_progress_label_bre TRUE}
+            {dx_song_progress_label dx_song_progress_label_needle TRUE}
+            {dx_song_progress_label dx_song_progress_label TRUE}
+            {dx_get_this_countdown_array}
+            {dx_song_progress_instrument_label dx_song_progress_instrument_label TRUE}
+         }
          {dx_game_hud_label dx_hud_label_band_streak $dx_hud_band_streak_text_size $dx_hud_band_streak_text_font $dx_hud_band_streak_text_alignment $dx_hud_band_streak_text_kerning $dx_hud_band_streak_text_x $dx_hud_band_streak_text_z $dx_hud_band_streak_text_y $dx_hud_band_streak_text_r $dx_hud_band_streak_text_g $dx_hud_band_streak_text_b TRUE}
          {beatmatch foreach_active_player $player
             {if {!= {$player instrument} vocals}
@@ -156,7 +158,9 @@
          {dx_show_track_username}
          {dx_dim_remote_players}
          {dx_mtv_time_remaining_handler}
-         {dx_new_set_song_progress_backer $dx_song_progress_bar}
+         {if {&& {! {gamemode in_mode practice}} {! {gamemode in_mode trainer}}}
+            {dx_new_set_song_progress_backer $dx_song_progress_bar}
+         }
          {if {! {modifier_mgr is_modifier_active mod_brutalmode}} ;brutal mode relies on crowd meter accuracy
             {if {== $dx_crowd_meter_state dx_disabled} {adjust_crowd_rating 1}} ;max out crowd meter when it's disabled for crowd audio
          }