From 5969ccb7fd2b9eb69619b012b05506e5222136b6 Mon Sep 17 00:00:00 2001 From: robojumper Date: Fri, 6 Jun 2025 23:30:01 +0200 Subject: [PATCH] Consistent names --- include/d/snd/d_snd_3d_actor.h | 4 ++-- src/d/snd/d_snd_3d_actor.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d/snd/d_snd_3d_actor.h b/include/d/snd/d_snd_3d_actor.h index 0d9c5e95..ce5b37c7 100644 --- a/include/d/snd/d_snd_3d_actor.h +++ b/include/d/snd/d_snd_3d_actor.h @@ -10,7 +10,7 @@ class dSnd3DActor_c : public nw4r::snd::Sound3DActor { static const u32 NUM_SOUNDS = 4; public: - dSnd3DActor_c(dSndSourceParam *pAmbientParam, u8); + dSnd3DActor_c(dSndSourceParam *pSourceParam, u8); virtual ~dSnd3DActor_c() {} @@ -88,7 +88,7 @@ protected: /* 0xAC */ nw4r::math::VEC3 mPositionTransformedByListener; /* 0xB8 */ f32 mDistanceToCameraTarget; /* 0xBC */ nw4r::math::VEC3 mPositionRelativeToCameraTarget; - /* 0xC8 */ dSndSourceParam *mpFloatBundle; + /* 0xC8 */ dSndSourceParam *mpSourceParam; /* 0xCC */ u16 mFlags; /* 0xD0 */ nw4r::math::VEC3 mPositionRelativeToPlayer; /* 0xDC */ f32 mDistanceToPlayer; diff --git a/src/d/snd/d_snd_3d_actor.cpp b/src/d/snd/d_snd_3d_actor.cpp index bf0ddd05..f617fb35 100644 --- a/src/d/snd/d_snd_3d_actor.cpp +++ b/src/d/snd/d_snd_3d_actor.cpp @@ -9,7 +9,7 @@ #include -dSnd3DActor_c::dSnd3DActor_c(dSndSourceParam *pFloatBundle, u8 a2) +dSnd3DActor_c::dSnd3DActor_c(dSndSourceParam *pSourceParam, u8 a2) : nw4r::snd::Sound3DActor( dSndPlayerMgr_c::GetInstance()->getSoundArchivePlayerForType(a2), dSnd3DManager_c::GetInstance()->getManager() ), @@ -24,7 +24,7 @@ dSnd3DActor_c::dSnd3DActor_c(dSndSourceParam *pFloatBundle, u8 a2) mDistanceToListener(INFINITY), mCameraDirectionDot(0.0f), a_field_0x9C(0.0f), - mpFloatBundle(pFloatBundle), + mpSourceParam(pSourceParam), mFlags(0), mDistanceToPlayer(INFINITY), a_field_0xE0(0.0f) {