diff --git a/src/Core/GameProject/CGameInfo.h b/src/Core/GameProject/CGameInfo.h index 96681725..441279a3 100644 --- a/src/Core/GameProject/CGameInfo.h +++ b/src/Core/GameProject/CGameInfo.h @@ -12,7 +12,7 @@ // they serve similar purposes, no real reason for them to be different classes class CGameInfo { - EGame mGame; + EGame mGame{EGame::Invalid}; // List of known builds of each game struct SBuildInfo @@ -34,9 +34,7 @@ class CGameInfo std::map mAreaNameMap; public: - CGameInfo() - : mGame(EGame::Invalid) - {} + CGameInfo() = default; bool LoadGameInfo(EGame Game); bool LoadGameInfo(TString Path); diff --git a/src/Core/Resource/Cooker/CMaterialCooker.cpp b/src/Core/Resource/Cooker/CMaterialCooker.cpp index f47f0271..4ea46ecb 100644 --- a/src/Core/Resource/Cooker/CMaterialCooker.cpp +++ b/src/Core/Resource/Cooker/CMaterialCooker.cpp @@ -1,10 +1,7 @@ #include "CMaterialCooker.h" #include -CMaterialCooker::CMaterialCooker() - : mpMat(nullptr) -{ -} +CMaterialCooker::CMaterialCooker() = default; uint32 CMaterialCooker::ConvertFromVertexDescription(FVertexDescription VtxDesc) { diff --git a/src/Core/Resource/Cooker/CMaterialCooker.h b/src/Core/Resource/Cooker/CMaterialCooker.h index 277b1068..8760388a 100644 --- a/src/Core/Resource/Cooker/CMaterialCooker.h +++ b/src/Core/Resource/Cooker/CMaterialCooker.h @@ -7,9 +7,9 @@ class CMaterialCooker { - CMaterialSet *mpSet; - CMaterial *mpMat; - EGame mVersion; + CMaterialSet *mpSet = nullptr; + CMaterial *mpMat = nullptr; + EGame mVersion{}; std::vector mTextureIDs; std::vector mMaterialHashes; diff --git a/src/Core/Resource/Script/NPropertyMap.cpp b/src/Core/Resource/Script/NPropertyMap.cpp index af1fb5a3..30b468a7 100644 --- a/src/Core/Resource/Script/NPropertyMap.cpp +++ b/src/Core/Resource/Script/NPropertyMap.cpp @@ -50,7 +50,7 @@ struct SNameKey }; SNameKey() - : TypeHash(-1), ID(-1) + : TypeHash(UINT32_MAX), ID(UINT32_MAX) {} SNameKey(uint32 InTypeHash, uint32 InID)