aboutsummaryrefslogtreecommitdiffstats
path: root/OpenAL32
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-11-19 23:48:45 -0800
committerChris Robinson <[email protected]>2018-11-19 23:48:45 -0800
commiteb2937de8419dddc73952feef5119e6a6be2a93d (patch)
tree2996b45cec9311be2e13fbb4a28edb059ea15c4b /OpenAL32
parent288dbbe8864ac2ede7031138f73a20de4da6ca31 (diff)
Avoid another case of a variable named the same as a type
Diffstat (limited to 'OpenAL32')
-rw-r--r--OpenAL32/Include/alAuxEffectSlot.h2
-rw-r--r--OpenAL32/alAuxEffectSlot.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index ca2cb663..6e315e8f 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -81,7 +81,7 @@ struct ALeffectslot {
ALenum EffectType{AL_EFFECT_NULL};
ALeffectProps EffectProps{};
- EffectState *EffectState{nullptr};
+ EffectState *mEffectState{nullptr};
ALfloat RoomRolloff{0.0f}; /* Added to the source's room rolloff, not multiplied. */
ALfloat DecayTime{0.0f};
diff --git a/OpenAL32/alAuxEffectSlot.cpp b/OpenAL32/alAuxEffectSlot.cpp
index cab9e43d..d4608bf1 100644
--- a/OpenAL32/alAuxEffectSlot.cpp
+++ b/OpenAL32/alAuxEffectSlot.cpp
@@ -650,7 +650,7 @@ ALenum InitEffectSlot(ALeffectslot *slot)
if(!slot->Effect.State) return AL_OUT_OF_MEMORY;
slot->Effect.State->IncRef();
- slot->Params.EffectState = slot->Effect.State;
+ slot->Params.mEffectState = slot->Effect.State;
return AL_NO_ERROR;
}
@@ -666,8 +666,8 @@ ALeffectslot::~ALeffectslot()
if(Effect.State)
Effect.State->DecRef();
- if(Params.EffectState)
- Params.EffectState->DecRef();
+ if(Params.mEffectState)
+ Params.mEffectState->DecRef();
}
void UpdateEffectSlotProps(ALeffectslot *slot, ALCcontext *context)