summaryrefslogtreecommitdiff
path: root/src/d/lyt/msg_window/d_lyt_msg_window.cpp
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2025-07-09 22:18:34 +0200
committerrobojumper <robojumper@gmail.com>2025-09-13 11:07:47 +0200
commita617b9f8cf8a6c3688f1034b2db641c9a092900c (patch)
tree90969139b18ebfcd2c704e9ca4cee9eacfc3a438 /src/d/lyt/msg_window/d_lyt_msg_window.cpp
parent4f9d63d357dfbdf3f08a7294eb2fbc7ccfe790cf (diff)
Cleanup
Diffstat (limited to 'src/d/lyt/msg_window/d_lyt_msg_window.cpp')
-rw-r--r--src/d/lyt/msg_window/d_lyt_msg_window.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/d/lyt/msg_window/d_lyt_msg_window.cpp b/src/d/lyt/msg_window/d_lyt_msg_window.cpp
index 89e027a5..a7444bf5 100644
--- a/src/d/lyt/msg_window/d_lyt_msg_window.cpp
+++ b/src/d/lyt/msg_window/d_lyt_msg_window.cpp
@@ -28,6 +28,7 @@
// clang-format on
#include "d/d_gfx.h"
+#include "d/snd/d_snd_player_mgr.h"
#include "d/snd/d_snd_small_effect_mgr.h"
#include "f/f_base.h"
#include "m/m_fader_base.h"
@@ -37,7 +38,6 @@
#include "toBeSorted/d_d3d.h"
#include "toBeSorted/event_manager.h"
#include "toBeSorted/fi_context.h"
-#include "toBeSorted/music_mgrs.h"
#include "toBeSorted/other_sound_stuff.h"
#include <cstring>
@@ -345,7 +345,7 @@ void dLytMsgWindow_c::initializeState_WaitKeyChangePage0() {
if (field_0x811 != 0) {
field_0x812 = 1;
} else if (field_0x814 == 0) {
- fn_8035E860(BGM_MGR);
+ dSndPlayerMgr_c::GetInstance()->enterMsgWait();
}
}
void dLytMsgWindow_c::executeState_WaitKeyChangePage0() {
@@ -360,7 +360,7 @@ void dLytMsgWindow_c::executeState_WaitKeyChangePage0() {
allowChange = true;
}
} else if (dPad::getDownTrigA() || fn_8011A5D0()) {
- fn_8035E880(BGM_MGR);
+ dSndPlayerMgr_c::GetInstance()->leaveMsgWait();
allowChange = true;
}
@@ -403,7 +403,7 @@ void dLytMsgWindow_c::initializeState_WaitKeyMsgEnd0() {
if (field_0x811 != 0) {
field_0x812 = 1;
} else if (mpTagProcessor->getField_0x90E() == 0 && field_0x814 == 0) {
- fn_8035E860(BGM_MGR);
+ dSndPlayerMgr_c::GetInstance()->enterMsgWait();
}
}
void dLytMsgWindow_c::executeState_WaitKeyMsgEnd0() {
@@ -420,7 +420,7 @@ void dLytMsgWindow_c::executeState_WaitKeyMsgEnd0() {
allowChange = true;
}
} else if (dPad::getDownTrigA() || fn_8011A5D0()) {
- fn_8035E880(BGM_MGR);
+ dSndPlayerMgr_c::GetInstance()->leaveMsgWait();
allowChange = true;
}
@@ -441,7 +441,7 @@ void dLytMsgWindow_c::executeState_WaitKeyMsgEnd0() {
}
field_0x810 = 0;
} else {
- fn_8035E820(BGM_MGR);
+ dSndPlayerMgr_c::GetInstance()->unsetMsgActor();
if (mpTagProcessor->getField_0x90E() != 0) {
mStateMgr.changeState(StateID_WaitKeySelectQuestion);
} else {
@@ -465,7 +465,7 @@ void dLytMsgWindow_c::executeState_WaitKeyMsgEnd1() {
}
field_0x810 = 0;
} else {
- fn_8035E820(BGM_MGR);
+ dSndPlayerMgr_c::GetInstance()->unsetMsgActor();
if (mpTagProcessor->getField_0x90E() != 0) {
mStateMgr.changeState(StateID_WaitKeySelectQuestion);
} else if (field_0x817 == 0) {