From 7433cb5f4cb0515dd6e314978f579ae91e2c63c4 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 18 Nov 2018 03:39:32 -0800 Subject: Avoid naming a struct member the same as an enum type --- Alc/alu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Alc/alu.cpp') diff --git a/Alc/alu.cpp b/Alc/alu.cpp index 91d9e758..92aa2bc4 100644 --- a/Alc/alu.cpp +++ b/Alc/alu.cpp @@ -328,7 +328,7 @@ static bool CalcContextParams(ALCcontext *Context) Listener.Params.MetersPerUnit; Listener.Params.SourceDistanceModel = props->SourceDistanceModel; - Listener.Params.DistanceModel = props->DistanceModel; + Listener.Params.mDistanceModel = props->mDistanceModel; ATOMIC_REPLACE_HEAD(struct ALcontextProps*, &Context->FreeContextProps, props); return true; @@ -1210,7 +1210,7 @@ static void CalcAttnSourceParams(ALvoice *voice, const struct ALvoiceProps *prop ClampedDist = Distance; switch(Listener.Params.SourceDistanceModel ? - props->DistanceModel : Listener.Params.DistanceModel) + props->mDistanceModel : Listener.Params.mDistanceModel) { case DistanceModel::InverseClamped: ClampedDist = clampf(ClampedDist, props->RefDistance, props->MaxDistance); -- cgit v1.2.3