mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-11 22:50:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into d_a_obj_boomerang

Browse Source
This commit is contained in:
elijah-thomas774
2025-06-15 14:44:22 -04:00
parent e4b1c30f47 810f61fe94
commit 2d28d9131f
5 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/egg/audio/eggAudioRmtSpeakerMgr.cpp
+18 -18
View File
@@ -13,39 +13,39 @@ bool AudioRmtSpeakerMgr::sTask;
u8 AudioRmtSpeakerMgr::sAudioRmtSpeakerWpadVolume = 0x58;
AudioRmtSpeakerTask AudioRmtSpeakerMgr::sTasks[0x14];
AudioRmtSpeakerTask AudioRmtSpeakerMgr::sConnectTask[0x14];
void AudioRmtSpeakerMgr::setupCallback(s32 arg1, s32 arg2) {
if (arg2 == 0) {
if (sTasks[mTaskFinishCount].mpCallback != nullptr) {
(sTasks[mTaskFinishCount].mpCallback)(arg1, arg2);
if (sConnectTask[mTaskFinishCount].mpCallback != nullptr) {
(sConnectTask[mTaskFinishCount].mpCallback)(arg1, arg2);
}
sAudioRmtSpeakerWpadVolume = WPADGetSpeakerVolume();
} else {
setup(arg1, sTasks[mTaskFinishCount].mpCallback);
setup(arg1, sConnectTask[mTaskFinishCount].mpCallback);
}
sTasks[mTaskFinishCount].field_0x01 = true;
sConnectTask[mTaskFinishCount].field_0x01 = true;
}
void AudioRmtSpeakerMgr::shutdownCallback(s32 arg1, s32 arg2) {
if ((u32)arg2 + 1 <= 1) {
if (sTasks[mTaskFinishCount].mpCallback != nullptr) {
(sTasks[mTaskFinishCount].mpCallback)(arg1, arg2);
if (sConnectTask[mTaskFinishCount].mpCallback != nullptr) {
(sConnectTask[mTaskFinishCount].mpCallback)(arg1, arg2);
}
} else {
shutdown(arg1, sTasks[mTaskFinishCount].mpCallback);
shutdown(arg1, sConnectTask[mTaskFinishCount].mpCallback);
}
sTasks[mTaskFinishCount].field_0x01 = true;
sConnectTask[mTaskFinishCount].field_0x01 = true;
}
void AudioRmtSpeakerMgr::add_task(s32 i, WPADCallback *pCallback, bool enable) {
BOOL intr = OSDisableInterrupts();
u32 index = mTaskRequestCount;
sTasks[index].mChannel = i;
sTasks[index].field_0x00 = enable;
sTasks[index].mpCallback = pCallback;
sTasks[index].field_0x01 = false;
sConnectTask[index].mChannel = i;
sConnectTask[index].field_0x00 = enable;
sConnectTask[index].mpCallback = pCallback;
sConnectTask[index].field_0x01 = false;
if (++mTaskRequestCount >= 0x14) {
mTaskRequestCount = 0;
}
@@ -56,7 +56,7 @@ void AudioRmtSpeakerMgr::add_task(s32 i, WPADCallback *pCallback, bool enable) {
void AudioRmtSpeakerMgr::doSetup(s32 i, WPADCallback *pCallback) {
if (!nw4r::snd::SoundSystem::GetRemoteSpeaker(i).Setup(pCallback)) {
add_task(i, pCallback, true);
sTasks[mTaskRequestCount].field_0x01 = true;
sConnectTask[mTaskRequestCount].field_0x01 = true;
}
}
@@ -67,14 +67,14 @@ void AudioRmtSpeakerMgr::doShutdown(s32 i, WPADCallback *pCallback) {
void AudioRmtSpeakerMgr::calc() {
if (!sTask) {
if (mTaskRequestCount != mTaskFinishCount) {
if (sTasks[mTaskFinishCount].field_0x00) {
doSetup(sTasks[mTaskFinishCount].mChannel, setupCallback);
if (sConnectTask[mTaskFinishCount].field_0x00) {
doSetup(sConnectTask[mTaskFinishCount].mChannel, setupCallback);
} else {
doShutdown(sTasks[mTaskFinishCount].mChannel, shutdownCallback);
doShutdown(sConnectTask[mTaskFinishCount].mChannel, shutdownCallback);
}
sTask = true;
}
} else if (sTasks[mTaskFinishCount].field_0x01) {
} else if (sConnectTask[mTaskFinishCount].field_0x01) {
sTask = false;
mTaskFinishCount++;
if (mTaskFinishCount >= 0x14) {
src/egg/gfx/eggDrawPathDOF.cpp
+4 -4
View File
@@ -123,9 +123,9 @@ void DrawPathDOF::internalDraw(u16 idx) {
}
if (field_0x20 == 2) {
internalDrawVariant2(idx);
internalDrawLite(idx);
} else {
internalDrawVariant01(idx);
internalDrawStandard(idx);
}
switch (idx) {
@@ -141,9 +141,9 @@ void DrawPathDOF::internalDraw(u16 idx) {
}
}
void DrawPathDOF::internalDrawVariant01(u16 idx) {}
void DrawPathDOF::internalDrawStandard(u16 idx) {}
void DrawPathDOF::internalDrawVariant2(u16 idx) {
void DrawPathDOF::internalDrawLite(u16 idx) {
const Screen &screen = GlobalDrawState::getScreen();
const Screen::DataEfb &efb = screen.GetDataEfb();
switch (idx) {