Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-07 22:28:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Forgot one thing

Browse Source
This commit is contained in:
korenkonder
2023-10-08 22:46:38 +03:00
parent 491f27e9ab
commit 1dfed8adeb
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReDIVA/pv_game/pv_game.cpp
+14 -7
View File
@@ -2303,18 +2303,24 @@ std::string pv_game::get_song_name() {
std::string pv_game::get_song_file_name(int32_t& ex_song_index) {
ex_song_index = -1;
std::string song_file_name;
song_file_name.assign(data.pv->song_file_name);
const pv_db_pv* pv = data.pv;
if (pv->ex_song.data.size()) {
if (data.play_data.ex_song_index < 0) {
int32_t _ex_song_index = sub_1400FCFD0(data.chara, pv);
if (_ex_song_index >= 0 && _ex_song_index < pv->ex_song.data.size()) {
ex_song_index = _ex_song_index;
return pv->ex_song.data[_ex_song_index].file;
song_file_name.assign(pv->ex_song.data[_ex_song_index].file);
}
}
else if (data.play_data.ex_song_index > 0 && data.play_data.ex_song_index <= pv->ex_song.data.size()) {
ex_song_index = data.play_data.ex_song_index - 1;
return pv->ex_song.data[data.play_data.ex_song_index - 1LL].file;
else {
if (data.play_data.ex_song_index > 0
&& data.play_data.ex_song_index <= pv->ex_song.data.size()) {
ex_song_index = data.play_data.ex_song_index - 1;
song_file_name.assign(pv->ex_song.data[data.play_data.ex_song_index - 1LL].file);
}
}
}
@@ -2326,12 +2332,13 @@ std::string pv_game::get_song_file_name(int32_t& ex_song_index) {
v15 = &v13->field_28[v13->field_0.stage_index];
if (pv->another_song.size() && v15->field_2C.another_song_index < pv->another_song.size()) {
const std::string& another_song_file_name = pv->another_song[v15->field_2C.another_song_index].song_file_name;
const std::string& another_song_file_name = pv->another_song[
v15->field_2C.another_song_index].song_file_name;
if (another_song_file_name.size())
return another_song_file_name;
song_file_name.assign(another_song_file_name);
}
return data.pv->song_file_name;
return song_file_name;
}
task_stage_info pv_game::get_stage_info(int32_t stage_index) {