diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2024-12-24 12:36:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-24 02:36:01 -0800 |
| commit | d874f05f44b97c6852867453394e2308d771f86a (patch) | |
| tree | 924e93151a89c32be37b655f40cfa2a90e91e52b /src/Z2AudioLib/Z2SeMgr.cpp | |
| parent | e0ea8495f78feb83aaba7700f668fc3d52405c1d (diff) | |
d_a_obj_wsStick, d_a_obj_onsenTaru OK (#2268)
* d_a_obj_wsStick, d_a_obj_onsenTaru OK
* d_a_obj_pdtile OK
* d_a_obj_stone equivalent
* d_a_npc_lf OK
* Z2SoundMgr OK
* Remove fixed nonmatching comment
* d_a_obj_kantera OK
* Remove unneeded header
* daMyna_c::deleteItem matching
* d_a_obj_crvsteel OK
Diffstat (limited to 'src/Z2AudioLib/Z2SeMgr.cpp')
| -rw-r--r-- | src/Z2AudioLib/Z2SeMgr.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/Z2AudioLib/Z2SeMgr.cpp b/src/Z2AudioLib/Z2SeMgr.cpp index 920ee7c900..4c3a4c7655 100644 --- a/src/Z2AudioLib/Z2SeMgr.cpp +++ b/src/Z2AudioLib/Z2SeMgr.cpp @@ -119,7 +119,7 @@ void Z2SeMgr::modHeightAtCamera(Vec const** param_0) { } } field_0x340[idx] = **param_0; - Vec cam_pos = Z2GetAudience()->getAudioCamPos(); + Vec cam_pos = Z2GetAudience()->getAudioCamPos(0); if (field_0x340[idx].y > cam_pos.y) { field_0x340[idx].y = cam_pos.y; } @@ -266,19 +266,19 @@ bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_ break; case Z2SE_SY_TALK_START: case Z2SE_SY_TALK_END: - if (Z2GetSceneMgr()->getCurrentSceneNum() != 0) { + if (Z2GetStatusMgr()->getDemoStatus() != 0) { return false; } break; case Z2SE_SY_TALK_NEXT: - if (Z2GetSceneMgr()->isMovieDemo()) { + if (Z2GetStatusMgr()->isMovieDemo()) { i_soundID = Z2SE_SY_DEMO_MESSAGE_NEXT; } break; case Z2SE_SY_TALK_WIN_CLOSE: - if (Z2GetSceneMgr()->getCurrentSceneNum() == 1) { + if (Z2GetStatusMgr()->getDemoStatus() == 1) { i_soundID = Z2SE_SY_TALK_END; - } else if (Z2GetSceneMgr()->isMovieDemo()) { + } else if (Z2GetStatusMgr()->isMovieDemo()) { i_soundID = Z2SE_SY_DEMO_MESSAGE_END; } break; @@ -287,11 +287,13 @@ bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_ return false; } break; - case Z2SE_OBJ_CHANDELIER_SWING: - if (i_pos->y > Z2GetAudience()->getAudioCamPos().y) { + case Z2SE_OBJ_CHANDELIER_SWING: { + Vec tmp = Z2GetAudience()->getAudioCamPos(0); + if (i_pos->y > tmp.y) { return false; } break; + } case Z2SE_OBJ_CHANDLV5_SWING: i_volume = Z2Calc::getParamByExp(param_2, 35.0f, 261.0f, 0.4f, 0.05f, 1.0f, Z2Calc::CURVE_SIGN_2); @@ -313,7 +315,8 @@ bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_ Z2Calc::CURVE_SIGN_2); break; case Z2SE_OBJ_L8_B_FOG_FLY: - if (i_pos->y > Z2GetAudience()->getAudioCamPos().y) { + Vec tmp = Z2GetAudience()->getAudioCamPos(0); + if (i_pos->y > tmp.y) { return false; } break; |