Skip to content

Commit 54a4052

Browse files
committed
Actually hit save on these changes
1 parent 5d5eeab commit 54a4052

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/SoundPlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ void SoundPlayer::FadeOut(f32 seconds)
934934
{
935935
if (this->bgm != NULL)
936936
{
937-
player->bgm->FadeOut(seconds);
937+
this->bgm->FadeOut(seconds);
938938
}
939939
}
940940
}; // namespace th08

src/SoundPlayer.hpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ struct SoundPlayerCommand
7777

7878
#define NUM_SOUND_BUFFERS 128
7979
#define NUM_BGM_SLOTS 16
80-
#define SOUND_QUEUE_LENGTH 12
80+
#define SFX_QUEUE_LENGTH 12
81+
#define BGM_QUEUE_LENGTH 31
8182

8283
class SoundPlayer
8384
{
@@ -120,16 +121,16 @@ class SoundPlayer
120121
DWORD bgmThreadId;
121122
HANDLE bgmThreadHandle;
122123
i32 unk61c;
123-
i32 soundQueue[SOUND_QUEUE_LENGTH];
124-
i32 unk650[SOUND_QUEUE_LENGTH];
125-
u32 soundQueuePanData[SOUND_QUEUE_LENGTH][128];
124+
i32 soundQueue[SFX_QUEUE_LENGTH];
125+
i32 unk650[SFX_QUEUE_LENGTH];
126+
u32 soundQueuePanData[SFX_QUEUE_LENGTH][128];
126127
ThBgmFormat *bgmPreloadFmtData[NUM_BGM_SLOTS];
127128
LPBYTE unk1ec0[NUM_BGM_SLOTS];
128129
LPBYTE unk1f00[NUM_BGM_SLOTS];
129130
DWORD bgmPreloadAllocSizes[NUM_BGM_SLOTS];
130131
u32 unk1f80;
131132
ThBgmFormat *bgmFmtData;
132-
SoundPlayerCommand commandQueue[32];
133+
SoundPlayerCommand commandQueue[BGM_QUEUE_LENGTH + 1];
133134
char bgmFileNames[NUM_BGM_SLOTS][256];
134135
char currentBgmFileName[256];
135136
CStreamingSound *bgm;

0 commit comments

Comments
 (0)