diff --git a/codemp/client/snd_music.cpp b/codemp/client/snd_music.cpp index 2f58f18..1036095 100644 --- a/codemp/client/snd_music.cpp +++ b/codemp/client/snd_music.cpp @@ -74,7 +74,7 @@ struct MusicExitTime_t // need to declare this way for operator < below // I'm defining this '<' operator so STL's sort algorithm will work // - bool operator < (const MusicExitTime_t& _X) const {return (fTime < _X.fTime);} + bool operator < (const MusicExitTime_t& _x) const {return (fTime < _x.fTime);} }; // it's possible for all 3 of these to be empty if it's boss or death music diff --git a/codemp/renderer/mdx_format.h b/codemp/renderer/mdx_format.h index 95df8e2..d0f6294 100644 --- a/codemp/renderer/mdx_format.h +++ b/codemp/renderer/mdx_format.h @@ -87,7 +87,7 @@ typedef struct // (note that I've defined it using '>' internally, so it sorts with higher weights being "less", for distance weight-culling // #ifdef __cplusplus - bool operator < (const mdxmWeight_t& _X) const {return (boneWeight>_X.boneWeight);} + bool operator < (const mdxmWeight_t& _x) const {return (boneWeight>_x.boneWeight);} #endif } #ifndef __cplusplus @@ -107,7 +107,7 @@ typedef struct // I'm defining this '<' operator so this struct can be used as an STL key... // #ifdef __cplusplus - bool operator < (const mdxaCompBone_t& _X) const {return (memcmp(Comp,_X.Comp,sizeof(Comp))<0);} + bool operator < (const mdxaCompBone_t& _x) const {return (memcmp(Comp,_x.Comp,sizeof(Comp))<0);} #endif } #ifndef __cplusplus @@ -126,7 +126,7 @@ typedef struct // I'm defining this '<' operator so this struct can be used as an STL key... // #ifdef __cplusplus - bool operator < (const mdxaCompQuatBone_t& _X) const {return (memcmp(Comp,_X.Comp,sizeof(Comp))<0);} + bool operator < (const mdxaCompQuatBone_t& _x) const {return (memcmp(Comp,_x.Comp,sizeof(Comp))<0);} #endif } #ifndef __cplusplus