diff --git a/_ark/dx/ui/dx_ui_init.dta b/_ark/dx/ui/dx_ui_init.dta index a52a4911bc..9d1dd89bdb 100644 --- a/_ark/dx/ui/dx_ui_init.dta +++ b/_ark/dx/ui/dx_ui_init.dta @@ -895,15 +895,15 @@ DX_CURRENT_SONG_CLEAR ;{if $dx_ps3hw ; {set $dx_author_finder_is_enabled FALSE} ;} -{set $dx_forced_outro_vignette ()} -{resize $dx_forced_outro_vignette 0} +;{set $dx_forced_outro_vignette ()} +;{resize $dx_forced_outro_vignette 0} -{if $dx_forced_main_menu_bg - {set_elem {find $syscfg vignettes backdrops sv3} 1 $dx_forced_main_menu_bg} -} -{if $dx_forced_song_select_bg - {set_elem {find $syscfg vignettes backdrops sv4} 1 $dx_forced_song_select_bg} -} +;{if $dx_forced_main_menu_bg +; {set_elem {find $syscfg vignettes backdrops sv3} 1 $dx_forced_main_menu_bg} +;} +;{if $dx_forced_song_select_bg +; {set_elem {find $syscfg vignettes backdrops sv4} 1 $dx_forced_song_select_bg} +;} {switch $dx_fctype (ring {set $dx_fc_ring TRUE} {set $dx_fc_glow FALSE}) diff --git a/_ark/dx/ui/endgame/dx_endgame_macros.dta b/_ark/dx/ui/endgame/dx_endgame_macros.dta index 66a4012407..0f98ea1dd8 100644 --- a/_ark/dx/ui/endgame/dx_endgame_macros.dta +++ b/_ark/dx/ui/endgame/dx_endgame_macros.dta @@ -51,7 +51,7 @@ {ui sync_screen complete_screen 0}) ({meta_performer has_battle} {ui sync_screen complete_screen 0}) - {ui sync_screen maybe_outro_to_meta_loading_continue_screen 0} + {ui sync_screen meta_loading_continue_screen 0} } {ui sync_screen preload_nextsong_screen 0} } diff --git a/_ark/ui/endgame/complete.dta b/_ark/ui/endgame/complete.dta index bf9cb0ff3b..b280521308 100644 --- a/_ark/ui/endgame/complete.dta +++ b/_ark/ui/endgame/complete.dta @@ -78,11 +78,11 @@ {switch $component (continue.btn - {ui goto_screen #ifdef HX_WII maybe_outro_to_meta_loading_continue_screen #else meta_loading_continue_screen #endif})})} + {ui goto_screen meta_loading_continue_screen})})} {new BandScreen complete_screen - (panels GAME_SCREEN_PANELS_NO_TRACK coop_endgame_panel complete_panel) + (panels GAME_SCREEN_PANELS coop_endgame_panel complete_panel outro_vignette_loader) (focus complete_panel)} {new UIPanel @@ -142,7 +142,7 @@ {game_restart} {net_sync set_ui_state kNetUI_InGame}) (continue.btn - {ui goto_screen maybe_outro_to_meta_loading_continue_screen}) + {ui goto_screen meta_loading_continue_screen}) (delete.btn {ui push_screen demo_confirm_delete_screen}) (purchase.btn @@ -162,7 +162,7 @@ {new BandScreen demo_complete_screen - (panels GAME_SCREEN_PANELS_NO_TRACK demo_complete_panel) + (panels GAME_SCREEN_PANELS demo_complete_panel outro_vignette_loader) (focus demo_complete_panel)} {new UGCPurchasePanel diff --git a/_ark/ui/endgame/endgame.dta b/_ark/ui/endgame/endgame.dta index c146e45f90..4f0f5317ef 100644 --- a/_ark/ui/endgame/endgame.dta +++ b/_ark/ui/endgame/endgame.dta @@ -239,7 +239,7 @@ {new BandScreen coop_endgame_screen - (panels #ifdef HX_WII GAME_SCREEN_PANELS_NO_TRACK #else GAME_SCREEN_PANELS #endif coop_endgame_panel) + (panels GAME_SCREEN_PANELS coop_endgame_panel outro_vignette_loader) (focus coop_endgame_panel) (pending_restart FALSE) (TRANSITION_COMPLETE_MSG @@ -251,7 +251,7 @@ {new BandScreen coop_endgame_popups_screen - (panels #ifdef HX_WII GAME_SCREEN_PANELS_NO_TRACK #else GAME_SCREEN_PANELS #endif) + (panels GAME_SCREEN_PANELS outro_vignette_loader) (enter {overshell set_active_status kOvershellInGameShell}) (poll @@ -277,12 +277,12 @@ {new BandScreen preload_nextsong_screen - (panels game_time_panel #ifdef HX_WII GAME_SCREEN_PANELS_NO_TRACK #else GAME_SCREEN_PANELS #endif coop_endgame_panel preload_panel #ifdef HX_WII character_hide_hack_panel #endif) + (panels game_time_panel GAME_SCREEN_PANELS coop_endgame_panel preload_panel #ifdef HX_WII character_hide_hack_panel #endif) (focus preload_panel)} {new BandScreen preload_failed_nextsong_screen - (panels game_time_panel #ifdef HX_WII GAME_SCREEN_PANELS_NO_TRACK #else GAME_SCREEN_PANELS #endif coop_endgame_panel) + (panels game_time_panel GAME_SCREEN_PANELS coop_endgame_panel) (focus coop_endgame_panel) (TRANSITION_COMPLETE_MSG {meta_performer skip_song} @@ -326,7 +326,7 @@ {new BandScreen load_nextsong_screen - (panels game_time_panel world_panel coop_endgame_panel) + (panels game_time_panel world_panel coop_endgame_panel outro_vignette_loader) (focus coop_endgame_panel) (TRANSITION_COMPLETE_MSG {song_mgr diff --git a/_ark/ui/game.dta b/_ark/ui/game.dta index b705983a22..9368ca9980 100644 --- a/_ark/ui/game.dta +++ b/_ark/ui/game.dta @@ -274,13 +274,42 @@ (on_guide_change {overshell update_all} PAUSE_MICS_ON_GUIDE_CHANGE)) -#ifdef HX_WII -#define GAME_SCREEN_PANELS -(world_panel coop_track_panel game sync_audio_net_panel) -#else +{new + UIPanel + outro_vignette_loader + (chosen_vignette '') + (load + {set + [chosen_vignette] + ''} + {if + {meta_performer is_set_complete} + {meta_performer upload_debug_stats} + {set + [chosen_vignette] + {interstitial_mgr pick_interstitial_between_screens meta_loading_outro song_select_screen}} + #ifndef _SHIP + {if + {ui get_vignettes_showing} + {print + "Loading outro vignette: " + [chosen_vignette] + "\n"} + {[chosen_vignette] + load}} + #else + {[chosen_vignette] + load} + #endif}) + (unload + {if + {!= + [chosen_vignette] + ''} + {[chosen_vignette] + unload}})} #define GAME_SCREEN_PANELS (game world_panel coop_track_panel sync_audio_net_panel) -#endif ; I hate wii #ifdef HX_WII #define GAME_SCREEN_PANELS_NO_TRACK @@ -353,7 +382,7 @@ {new BandScreen restart_game_screen - (panels GAME_SCREEN_PANELS_NO_TRACK 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}) diff --git a/_ark/ui/meta_loading.dta b/_ark/ui/meta_loading.dta index 89236441dc..50fd487aff 100644 --- a/_ark/ui/meta_loading.dta +++ b/_ark/ui/meta_loading.dta @@ -153,7 +153,6 @@ {$vignette_panel set_showing TRUE} {$this set_focus_panel $vignette_panel}}}}}) (enter - {world_panel unload} ;HACK attempt to free memory by unloading the world panel #ifdef HX_WII {if {'||' @@ -550,78 +549,6 @@ TRUE) {[loaded_vignette] check_is_loaded}})) -{new - UIPanel - outro_vignette_loader - (chosen_vignette '') - (enter - {set - [chosen_vignette] - ''} - {if {!= [chosen_vignette] ''} ;{!= $dx_forced_outro_vignette none} ;if we turned off song transitions, we cant run outro_vignette_loader or it will crash - {if - {meta_performer is_set_complete} - {meta_performer upload_debug_stats} - {set - [chosen_vignette] - {interstitial_mgr pick_interstitial_between_screens meta_loading_outro song_select_screen}} - #ifndef _SHIP - {if - {ui get_vignettes_showing} - {print - "Loading outro vignette: " - [chosen_vignette] - "\n"} - {if - {!= - [chosen_vignette] - ''} - {[chosen_vignette] - load}}} - #else - {if - {!= - [chosen_vignette] - ''} - {[chosen_vignette] - load}} - #endif}}) - (exit - {if - {!= - [chosen_vignette] - ''} - {[chosen_vignette] - unload}})} -{new - BandScreen - maybe_outro_to_meta_loading_continue_screen - (enter {world_panel unload}) - (TRANSITION_COMPLETE_MSG - {ui goto_screen outro_to_meta_loading_continue_screen} - ;{dx_play_cutscene - ; {cond - ; ({> {size $dx_forced_outro_vignette} 0} {random_elem $dx_forced_outro_vignette}) - ; ({== {meta_performer get_last_venue_class} video} {random_elem ("tv_fallback")}) - ; ({== {meta_performer get_last_venue_class} festival} {random_elem ("tv4_c")}) - ; ({campaign has_reached_campaign_level campaignlevel_jet} {random_elem ("tv4_d" "tv4_e")}) - ; ({campaign has_reached_campaign_level campaignlevel_bus} {random_elem ("tv4_c")}) - ; ({campaign has_reached_campaign_level campaignlevel_van} {random_elem ("tv4_b")}) - ; (TRUE {random_elem ("tv4_a")}) - ; } - ;meta_loading_continue_screen - ;} - ) -} -{new - BandScreen - outro_to_meta_loading_continue_screen - (panels outro_vignette_loader transition_fallback_panel) - (enter - {transition_fallback_panel set_showing TRUE} - {transition_fallback_panel start_loading_anim}) - (TRANSITION_COMPLETE_MSG - {ui goto_screen meta_loading_continue_screen})} {new BandScreen meta_loading_continue_screen diff --git a/_ark/ui/overshell/slot_states.dta b/_ark/ui/overshell/slot_states.dta index 9f88f4679d..87f16fae33 100644 --- a/_ark/ui/overshell/slot_states.dta +++ b/_ark/ui/overshell/slot_states.dta @@ -783,7 +783,6 @@ {dx_midi_parser_var_reset} {dx_game_var_reset} {dx_active_player_var_reset} - {world_panel unload} {if_else {gamemode in_mode qp_coop} {ui sync_screen meta_loading_continue_screen 0} {ui_event_mgr trigger_event quit_early} diff --git a/_ark/ui/tour/tour_challenge_results.dta b/_ark/ui/tour/tour_challenge_results.dta index 18b57a5443..93c96a143b 100644 --- a/_ark/ui/tour/tour_challenge_results.dta +++ b/_ark/ui/tour/tour_challenge_results.dta @@ -218,7 +218,7 @@ {{tour progress} are_all_tour_gigs_complete} {ui goto_screen tour_finished_screen} - {ui goto_screen maybe_outro_to_meta_loading_continue_screen}} + {ui goto_screen meta_loading_continue_screen}} kDataUnhandled} 0})})} {new @@ -246,11 +246,11 @@ {new BandScreen tour_challenge_results_screen - (panels GAME_SCREEN_PANELS_NO_TRACK tour_results_map_panel tour_challenge_results_panel) + (panels GAME_SCREEN_PANELS tour_results_map_panel tour_challenge_results_panel outro_vignette_loader) (focus tour_challenge_results_panel)} {new BandScreen tour_challenge_results_reload_screen - (panels GAME_SCREEN_PANELS_NO_TRACK) + (panels GAME_SCREEN_PANELS) (enter {ui goto_screen tour_challenge_results_screen})} \ No newline at end of file diff --git a/_ark/ui/tour/tour_finished.dta b/_ark/ui/tour/tour_finished.dta index 8440a6d291..d3827e9972 100644 --- a/_ark/ui/tour/tour_finished.dta +++ b/_ark/ui/tour/tour_finished.dta @@ -105,7 +105,7 @@ {tour reset_tour_data {tour get_profile}} - {ui goto_screen maybe_outro_to_meta_loading_continue_screen})} + {ui goto_screen meta_loading_continue_screen})} {new BandScreen tour_finished_screen