Skip to content

Commit

Permalink
remove high song count warning
Browse files Browse the repository at this point in the history
  • Loading branch information
jnackmclain committed Feb 1, 2025
1 parent 5ac868f commit 30e3c83
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 32 deletions.
3 changes: 2 additions & 1 deletion _ark/dx/overshell/dx_advanced_states.dta
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,8 @@
(off {push_back $options os_intro_off})
}
{push_back $options {if_else $dx_splash_screen os_splash_on os_splash_off}}
{push_back $options {if_else $dx_confirm_song_count os_confirm_songcount_on os_confirm_songcount_off}}
;remove high song count warn
;{push_back $options {if_else $dx_confirm_song_count os_confirm_songcount_on os_confirm_songcount_off}}
#ifdef RB3E
{switch $dx_connected_server
(none {push_back $options os_server_online})
Expand Down
10 changes: 5 additions & 5 deletions _ark/dx/read_write/dx_reader_macros.dta
Original file line number Diff line number Diff line change
Expand Up @@ -368,11 +368,11 @@
{elem {find $entry dx_prompt_save} 1}
}
}
{if {== {elem $entry 0} {basename dx_confirm_song_count}}
{set $dx_confirm_song_count
{elem {find $entry dx_confirm_song_count} 1}
}
}
;{if {== {elem $entry 0} {basename dx_confirm_song_count}}
; {set $dx_confirm_song_count
; {elem {find $entry dx_confirm_song_count} 1}
; }
;}
#ifdef RB3E
{if {== {elem $entry 0} {basename dx_connected_server}}
{set $dx_connected_server
Expand Down
2 changes: 1 addition & 1 deletion _ark/dx/read_write/dx_writer_macros.dta
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
{dx_setting_saver dx_settings dx_you_rock $dx_you_rock}
{dx_setting_saver dx_settings dx_enable_mv_venues $dx_enable_mv_venues}
{dx_setting_saver dx_settings dx_prompt_save $dx_prompt_save}
{dx_setting_saver dx_settings dx_confirm_song_count $dx_confirm_song_count}
;{dx_setting_saver dx_settings dx_confirm_song_count $dx_confirm_song_count}
{dx_setting_saver dx_settings dx_connected_server $dx_connected_server}
{dx_setting_saver dx_settings dx_rb3dx_venue
{if_else
Expand Down
8 changes: 4 additions & 4 deletions _ark/dx/ui/dx_ui_init.dta
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ DX_CURRENT_SONG_CLEAR
}
{set $dx_forced_song_select_bg FALSE}

{if_else $dx_event_mode
{set $dx_confirm_song_count FALSE}
{set $dx_confirm_song_count TRUE}
}
;{if_else $dx_event_mode
; {set $dx_confirm_song_count FALSE}
; {set $dx_confirm_song_count TRUE}
;}

{set $dx_time_remaining_pos_top FALSE}

Expand Down
43 changes: 22 additions & 21 deletions _ark/dx/ui/song_select/dx_song_select_funcs.dta
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,29 @@
{overshell set_active_status kOvershellInShell}
{overshell update_all}
{unless $dx_song_select_noise {synth stop_all_sfx TRUE}} ; dx - removes the annoying noises in song select
{if
#ifdef HX_PS3
{&&
$dx_confirm_song_count
#ifdef REGION_EUROPE
{! {file_exists "GD:/dev_hdd0/game/BLES00986/USRDIR/dx_high_memory.dta"}}
#else
{! {file_exists "GD:/dev_hdd0/game/BLUS30463/USRDIR/dx_high_memory.dta"}}
#endif
}
#else
$dx_confirm_song_count
#endif
{set $high_song_count 4500}
{unless $rb3e_checked_song_count
{set $rb3e_checked_song_count TRUE}
{if {> {{song_select_panel find song.lst} num_data} $high_song_count}
{dx_modal_messenger_symbol high_song_count_warn}
}
}
}
{$this dx_diff_maker}
;remove high song count warning
;{if
; #ifdef HX_PS3
; {&&
; $dx_confirm_song_count
; #ifdef REGION_EUROPE
; {! {file_exists "GD:/dev_hdd0/game/BLES00986/USRDIR/dx_high_memory.dta"}}
; #else
; {! {file_exists "GD:/dev_hdd0/game/BLUS30463/USRDIR/dx_high_memory.dta"}}
; #endif
; }
; #else
; $dx_confirm_song_count
; #endif
; {set $high_song_count 4500}
; {unless $rb3e_checked_song_count
; {set $rb3e_checked_song_count TRUE}
; {if {> {{song_select_panel find song.lst} num_data} $high_song_count}
; {dx_modal_messenger_symbol high_song_count_warn}
; }
; }
;}
;{unless $gocentral_sanity_checked
; {if {&& {! {session_mgr is_local}} {< {{song_select_panel find song.lst} num_data} 130}}
; {set $gocentral_sanity_checked TRUE}
Expand Down

0 comments on commit 30e3c83

Please sign in to comment.