From 0db8d5035927c977f4cf96d5436afc7353ab6de3 Mon Sep 17 00:00:00 2001 From: Richard Qian Date: Sun, 20 Dec 2020 19:14:52 -0600 Subject: [PATCH] More configurable music (loop end support, different race result music) (#4445) * Allow setting [again] track reverse mode via command line * Make composer field in music information files optional * Add support for loop end of music * Remove print statements used for checking current music play time * Support playing different music on race results screen Also make them configurable in stk_config.xml * Allow configuring grand prix win/lose and feature unlocked music in stk_config.xml * Fix coding indentation style * Fix warning when scrolling track screenshots in grand prix results * Display the rank a player kart finishes in if not in 1st place --- data/stk_config.xml | 23 +++++- src/audio/music_information.cpp | 22 +++--- src/audio/music_information.hpp | 2 + src/audio/music_ogg.cpp | 8 +- src/audio/music_ogg.hpp | 3 +- src/config/stk_config.cpp | 100 +++++++++++++++++++++++- src/config/stk_config.hpp | 29 ++++++- src/karts/kart.cpp | 2 +- src/main.cpp | 5 ++ src/states_screens/feature_unlocked.cpp | 3 +- src/states_screens/grand_prix_lose.cpp | 3 +- src/states_screens/grand_prix_win.cpp | 3 +- src/states_screens/race_result_gui.cpp | 88 ++++++++++++++++----- 13 files changed, 249 insertions(+), 42 deletions(-) diff --git a/data/stk_config.xml b/data/stk_config.xml index 013be2002..cc259320b 100644 --- a/data/stk_config.xml +++ b/data/stk_config.xml @@ -151,8 +151,27 @@ solver-split-impulse-threshold="-0.00001" solver-mode=""/> - - + +