diff --git a/src/Core/Resource/CWorld.cpp b/src/Core/Resource/CWorld.cpp index 7c265630..3f6c9240 100644 --- a/src/Core/Resource/CWorld.cpp +++ b/src/Core/Resource/CWorld.cpp @@ -2,20 +2,12 @@ #include "Core/GameProject/CResourceStore.h" #include "Core/Resource/Script/CScriptLayer.h" -CWorld::CWorld(CResourceEntry *pEntry /*= 0*/) +CWorld::CWorld(CResourceEntry *pEntry) : CResource(pEntry) - , mpWorldName(nullptr) - , mpDarkWorldName(nullptr) - , mpSaveWorld(nullptr) - , mpDefaultSkybox(nullptr) - , mpMapWorld(nullptr) - , mTempleKeyWorldIndex(0) { } -CWorld::~CWorld() -{ -} +CWorld::~CWorld() = default; std::unique_ptr CWorld::BuildDependencyTree() const { diff --git a/src/Core/Resource/CWorld.h b/src/Core/Resource/CWorld.h index 487b8b47..1e092639 100644 --- a/src/Core/Resource/CWorld.h +++ b/src/Core/Resource/CWorld.h @@ -21,7 +21,7 @@ class CWorld : public CResource TResPtr mpSaveWorld; TResPtr mpDefaultSkybox; TResPtr mpMapWorld; - uint32 mTempleKeyWorldIndex; + uint32 mTempleKeyWorldIndex = 0; struct STimeAttackData { @@ -31,7 +31,8 @@ class CWorld : public CResource float SilverTime; float GoldTime; float ShinyGoldTime; - } mTimeAttackData; + }; + STimeAttackData mTimeAttackData{}; struct SAudioGrp {