From 99888d455b7220e7277481a02ea24ff9112d4bbf Mon Sep 17 00:00:00 2001 From: korenkonder Date: Wed, 23 Jul 2025 13:27:00 +0300 Subject: [PATCH] Assumed that `sound_work_play_se` func had default value of `1.0f` --- src/CRE/auth_2d.cpp | 2 +- src/CRE/auth_3d.cpp | 2 +- src/CRE/sound.hpp | 2 +- src/ReDIVA/game_state.cpp | 4 ++-- src/ReDIVA/pv_game/pv_game.cpp | 4 ++-- src/ReDIVA/wait_screen.cpp | 6 +++--- src/ReDIVA/x_pv_game.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/CRE/auth_2d.cpp b/src/CRE/auth_2d.cpp index 967374f3..891784d2 100644 --- a/src/CRE/auth_2d.cpp +++ b/src/CRE/auth_2d.cpp @@ -1114,7 +1114,7 @@ void AetObj::CtrlLayer(const aet_layer* layer, float_t frame) { size_t aif_off = file.rfind(".aif"); if (aif_off != -1 && aif_off == file.size() - 4) { file.assign(file.substr(0, aif_off)); - sound_work_play_se(sound_queue_index, file.c_str(), 1.0f); + sound_work_play_se(sound_queue_index, file.c_str()); return; } diff --git a/src/CRE/auth_3d.cpp b/src/CRE/auth_3d.cpp index 434e4773..19fc164d 100644 --- a/src/CRE/auth_3d.cpp +++ b/src/CRE/auth_3d.cpp @@ -1271,7 +1271,7 @@ namespace auth_3d_detail { if (index >= 0 && index < ROB_CHARA_COUNT) sub_140532980(index, param1.c_str()); else if (sound_work_has_property(param1.c_str())) - sound_work_play_se(1, param1.c_str(), 1.0f); + sound_work_play_se(1, param1.c_str()); } void EventSnd::End(auth_3d* auth, int32_t flags, render_context* rctx) { diff --git a/src/CRE/sound.hpp b/src/CRE/sound.hpp index dec5e607..24c4d334 100644 --- a/src/CRE/sound.hpp +++ b/src/CRE/sound.hpp @@ -357,7 +357,7 @@ extern float_t sound_work_get_headphones_volume(); extern float_t sound_work_get_speakers_volume(); extern bool sound_work_has_property(const char* name); extern bool sound_work_load_farc(const char* file_path); -extern int32_t sound_work_play_se(int32_t queue_index, const char* name, float_t volume); +extern int32_t sound_work_play_se(int32_t queue_index, const char* name, float_t volume = 1.0f); extern bool sound_work_play_stream(int32_t index, const char* path, bool pause = false); extern bool sound_work_play_stream(int32_t index, const char* path, float_t time, bool pause = false); extern bool sound_work_read_farc(const char* file_path); diff --git a/src/ReDIVA/game_state.cpp b/src/ReDIVA/game_state.cpp index add8c071..64197004 100644 --- a/src/ReDIVA/game_state.cpp +++ b/src/ReDIVA/game_state.cpp @@ -1023,7 +1023,7 @@ bool GameState::Advertise::Ctrl() { bool v2 = false;//sub_1403F49C0(); if (input_state_get(0)->CheckTapped(2) && v2) { game_state_set_game_state_next(GAME_STATE_GAME); - sound_work_play_se(0, "se_sy_01", 1.0); + sound_work_play_se(0, "se_sy_01"); } //adv_touch_get()->sub_14014ED60(true); @@ -1047,7 +1047,7 @@ bool GameState::Advertise::Ctrl() { /*if (adv_touch_get()->field_70) { game_state_set_game_state_next(GAME_STATE_GAME); - sound_work_play_se(0, "se_sy_01", 1.0); + sound_work_play_se(0, "se_sy_01"); adv_touch_get()->sub_14014EC00(); }*/ diff --git a/src/ReDIVA/pv_game/pv_game.cpp b/src/ReDIVA/pv_game/pv_game.cpp index e10f394b..f4604a4a 100644 --- a/src/ReDIVA/pv_game/pv_game.cpp +++ b/src/ReDIVA/pv_game/pv_game.cpp @@ -1725,7 +1725,7 @@ int32_t pv_game::ctrl(float_t delta_time, int64_t curr_time) { data.success = true; data.play_data.init_aet_success_info(); if (/*sub_14013C8F0()->field_0.field_12A8D && */data.play_data.pvbranch_success_se_name.size()) - sound_work_play_se(2, data.play_data.pvbranch_success_se_name.c_str(), 1.0f); + sound_work_play_se(2, data.play_data.pvbranch_success_se_name.c_str()); } bool end = false; @@ -3859,7 +3859,7 @@ void pv_game::play_se(int32_t index) { if (diff && diff->effect_se_file_name.size() && index >= 0 && index < diff->effect_se_name_list.size() && diff->effect_se_name_list[index].size()) { - sound_work_play_se(1, diff->effect_se_name_list[index].c_str(), 1.0f); + sound_work_play_se(1, diff->effect_se_name_list[index].c_str()); data.se_index = index; } } diff --git a/src/ReDIVA/wait_screen.cpp b/src/ReDIVA/wait_screen.cpp index d617f709..f13f5118 100644 --- a/src/ReDIVA/wait_screen.cpp +++ b/src/ReDIVA/wait_screen.cpp @@ -249,7 +249,7 @@ bool TaskWaitScreen::init_load_start() { reload_aet_obj(0, "load_in", "load_loop"); started = false; - sound_work_play_se(1, "load01_2", 1.0f); + sound_work_play_se(1, "load01_2"); state = 2; } break; case 2: { @@ -258,13 +258,13 @@ bool TaskWaitScreen::init_load_start() { reload_aet_obj(0, "load_start", "end"); started = false; - sound_work_play_se(1, "load01_2", 1.0f); + sound_work_play_se(1, "load01_2"); state = 2; } break; case 3: { reload_aet_obj(0, "load_start", "end"); started = false; - sound_work_play_se(1, "load01_2", 1.0f); + sound_work_play_se(1, "load01_2"); state = 2; } break; default: diff --git a/src/ReDIVA/x_pv_game.cpp b/src/ReDIVA/x_pv_game.cpp index 5b349e68..8e0d3cce 100644 --- a/src/ReDIVA/x_pv_game.cpp +++ b/src/ReDIVA/x_pv_game.cpp @@ -8474,7 +8474,7 @@ void x_pv_game::load(int32_t pv_id, int32_t stage_id, chara_index charas[6], int Glitter::counter.Reset(); Glitter::glt_particle_manager->draw_all = false; - //sound_work_play_se(1, "load01_2", 1.0f); + //sound_work_play_se(1, "load01_2"); } #if BAKE_PV826