From d223bac56adf6dbce08691a966e1bf4b9bacd4e4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 11 Jun 2020 13:23:50 -0400 Subject: [PATCH] CAudioGroup: Make use of in-class initializers --- src/Core/Resource/CAudioGroup.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Core/Resource/CAudioGroup.h b/src/Core/Resource/CAudioGroup.h index 2172facb..b0143c53 100644 --- a/src/Core/Resource/CAudioGroup.h +++ b/src/Core/Resource/CAudioGroup.h @@ -10,20 +10,19 @@ class CAudioGroup : public CResource friend class CAudioGroupLoader; TString mGroupName; - uint32 mGroupID; + uint32 mGroupID = UINT32_MAX; std::vector mDefineIDs; public: - CAudioGroup(CResourceEntry *pEntry = 0) + explicit CAudioGroup(CResourceEntry *pEntry = nullptr) : CResource(pEntry) - , mGroupID(-1) {} // Accessors - inline TString GroupName() const { return mGroupName; } - inline uint32 GroupID() const { return mGroupID; } - inline uint32 NumSoundDefineIDs() const { return mDefineIDs.size(); } - inline uint16 SoundDefineIDByIndex(uint32 Index) const { return mDefineIDs[Index]; } + TString GroupName() const { return mGroupName; } + uint32 GroupID() const { return mGroupID; } + uint32 NumSoundDefineIDs() const { return mDefineIDs.size(); } + uint16 SoundDefineIDByIndex(uint32 Index) const { return mDefineIDs[Index]; } }; #endif // CAUDIOGROUP