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

Small AnimSound cleanup

Browse Source
This commit is contained in:
robojumper
2025-05-29 21:15:52 +02:00
parent e3b4063ff4
commit 0666c44c0a
3 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nw4r/snd/snd_AnimSound.h
+2 -6
View File
@@ -39,10 +39,6 @@ public:
return mIsRunning;
}
void SetRunning(bool running) {
mIsRunning = running;
}
void UpdateFrame() {
if (!mHandle.IsAttachedSound()) {
mpEvent = 0;
@@ -74,8 +70,8 @@ public:
}
}
bool StartSound(const AnimEvent *event, SoundStartable *startable, bool b);
bool HoldSound(const AnimEvent *event, SoundStartable *startable, bool b);
void StartSound(const AnimEvent *event, SoundStartable *startable, bool b);
void HoldSound(const AnimEvent *event, SoundStartable *startable, bool b);
void SetVolumePitch(const AnimEvent *event, bool b);
void SetVariable(const AnimEvent *event, u32 varNo, f32 f);
include/nw4r/snd/snd_AnimSoundReader.h
+4 -8
View File
@@ -6,7 +6,7 @@ namespace snd {
namespace detail {
struct AnimEvent {
u32 flags_0x00; // at 0x00
u32 flags; // at 0x00
u32 soundId; // at 0x04
detail::Util::DataRef<const char> soundLabelRef; // at 0x08
u8 volume; // at 0x10
@@ -17,7 +17,7 @@ struct AnimEvent {
UNKWORD field_0x1C; // at 0x1C
bool ShouldPreventStart() const {
return flags_0x00 & 1;
return flags & 1;
}
const char *GetSoundLabel() const {
@@ -25,17 +25,13 @@ struct AnimEvent {
}
bool GetVarNo(u32 *var) const {
if (ShouldSetVariable()) {
if (flags & 2) {
*var = varNo;
return true;
}
return false;
}
bool ShouldSetVariable() const {
return flags_0x00 & 2;
}
bool MatchesDirection(int playDirection) const {
bool ret = 0;
u32 config = field_0x11;
@@ -49,7 +45,7 @@ struct AnimEvent {
struct AnimEventRef {
int field_0x00; // at 0x08
int field_0x04; // at 0x04
u8 flags_0x08; // at 0x08
u8 flags; // at 0x08
s8 field_0x09; // at 0x09
u8 field_0x0A; // at 0x0A
Util::DataRef<AnimEvent> event; // at 0x0C
src/nw4r/snd/snd_AnimSound.cpp
+17 -21
View File
@@ -90,7 +90,7 @@ void AnimSoundImpl::UpdateFrame(f32 frame, PlayDirection dir) {
}
bool AnimSoundImpl::ShouldPlayEvent(const AnimEventRef *ref) const {
if (!(ref->flags_0x08 & 1) && (ref->flags_0x08 & 4 || ref->flags_0x08 & 2)) {
if (!(ref->flags & 1) && (ref->flags & 4 || ref->flags & 2)) {
return true;
}
int i1 = ut::Max((int)ref->field_0x09, 0);
@@ -119,7 +119,7 @@ void AnimSoundImpl::UpdateEvents(s32 duration, PlayDirection direction) {
}
if (ShouldPlayEvent(ref)) {
// HACK/Fakematch: Force a reload
if ((((AnimEventRef *)ref)->flags_0x08) & 1) {
if ((((AnimEventRef *)ref)->flags) & 1) {
UpdateTrigger(ref, duration, direction);
} else {
if (direction == FORWARD) {
@@ -202,7 +202,7 @@ void AnimSoundImpl::UpdateTrigger(const AnimEventRef *ref, s32 frame, PlayDirect
return;
}
if (ref->flags_0x08 & 4) {
if (ref->flags & 4) {
return;
}
@@ -210,7 +210,7 @@ void AnimSoundImpl::UpdateTrigger(const AnimEventRef *ref, s32 frame, PlayDirect
return;
}
if ((ref->flags_0x08 & 2)) {
if ((ref->flags & 2)) {
if (ref->field_0x00 == frame) {
StopEvent(event);
if (mCallback != NULL) {
@@ -249,12 +249,12 @@ void AnimSoundImpl::UpdateForwardRange(const AnimEventRef *ref, s32 frame) {
return;
}
if (ref->flags_0x08 & 4 && ref->flags_0x08 & 2) {
if (ref->flags & 4 && ref->flags & 2) {
HoldEvent(event, true);
return;
}
if (ref->flags_0x08 & 4) {
if (ref->flags & 4) {
if (ref->field_0x04 == frame && mCallback != NULL) {
(mCallback)(3, frame, event->GetSoundLabel(), event->field_0x1C, field_0x24);
}
@@ -267,7 +267,7 @@ void AnimSoundImpl::UpdateForwardRange(const AnimEventRef *ref, s32 frame) {
StopEvent(event);
}
}
} else if ((ref->flags_0x08 & 2)) {
} else if ((ref->flags & 2)) {
if (ref->field_0x00 == frame && mCallback != NULL) {
(mCallback)(2, frame, event->GetSoundLabel(), event->field_0x1C, field_0x24);
}
@@ -297,12 +297,12 @@ void AnimSoundImpl::UpdateBackwardRange(const AnimEventRef *ref, s32 frame) {
return;
}
if (ref->flags_0x08 & 4 && ref->flags_0x08 & 2) {
if (ref->flags & 4 && ref->flags & 2) {
HoldEvent(event, true);
return;
}
if (ref->flags_0x08 & 4) {
if (ref->flags & 4) {
if (ref->field_0x04 == frame && mCallback != NULL) {
(mCallback)(2, frame, event->GetSoundLabel(), event->field_0x1C, field_0x24);
}
@@ -311,7 +311,7 @@ void AnimSoundImpl::UpdateBackwardRange(const AnimEventRef *ref, s32 frame) {
} else if (field_0x1C == ref->field_0x09 && frame <= ref->field_0x04) {
HoldEvent(event, true);
}
} else if ((ref->flags_0x08 & 2)) {
} else if ((ref->flags & 2)) {
if (ref->field_0x00 == frame && mCallback != NULL) {
(mCallback)(3, frame, event->GetSoundLabel(), event->field_0x1C, field_0x24);
}
@@ -406,37 +406,33 @@ void AnimSoundImpl::StopEvent(const AnimEvent *event) {
}
}
bool AnimEventPlayer::StartSound(const AnimEvent *event, SoundStartable *startable, bool b) {
void AnimEventPlayer::StartSound(const AnimEvent *event, SoundStartable *startable, bool b) {
if (event->soundId == 0xFFFFFFFF) {
if (!startable->StartSound(GetHandle(), event->GetSoundLabel())) {
return false;
return;
}
} else {
if (!startable->StartSound(GetHandle(), event->soundId)) {
return false;
return;
}
}
SetVolumePitch(event, b);
return true;
}
bool AnimEventPlayer::HoldSound(const AnimEvent *event, SoundStartable *startable, bool b) {
void AnimEventPlayer::HoldSound(const AnimEvent *event, SoundStartable *startable, bool b) {
if (event->soundId == 0xFFFFFFFF) {
if (!startable->HoldSound(GetHandle(), event->GetSoundLabel())) {
return false;
return;
}
} else {
if (!startable->HoldSound(GetHandle(), event->soundId)) {
return false;
return;
}
}
GetHandle()->detail_GetAttachedSound()->SetAutoStopCounter(0);
SetVolumePitch(event, b);
return true;
}
void AnimEventPlayer::SetVolumePitch(const AnimEvent *event, bool b) {
@@ -468,7 +464,7 @@ void AnimEventPlayer::SetVariable(const AnimEvent *event, u32 varNo, f32 f) {
}
}
AnimEventPlayer::AnimEventPlayer() : mpEvent(0), mIsRunning(false) {}
AnimEventPlayer::AnimEventPlayer() : mpEvent(NULL), mIsRunning(false) {}
AnimEventPlayer::~AnimEventPlayer() {
if (mHandle.IsAttachedSound() && IsRunning()) {