CWorld: Make use of in-class initializers

Same behavior, less code.
This commit is contained in:
Lioncash 2020-06-14 19:47:02 -04:00
parent 128ee0d01c
commit 35ea47e473
2 changed files with 5 additions and 12 deletions

View File

@ -2,20 +2,12 @@
#include "Core/GameProject/CResourceStore.h" #include "Core/GameProject/CResourceStore.h"
#include "Core/Resource/Script/CScriptLayer.h" #include "Core/Resource/Script/CScriptLayer.h"
CWorld::CWorld(CResourceEntry *pEntry /*= 0*/) CWorld::CWorld(CResourceEntry *pEntry)
: CResource(pEntry) : CResource(pEntry)
, mpWorldName(nullptr)
, mpDarkWorldName(nullptr)
, mpSaveWorld(nullptr)
, mpDefaultSkybox(nullptr)
, mpMapWorld(nullptr)
, mTempleKeyWorldIndex(0)
{ {
} }
CWorld::~CWorld() CWorld::~CWorld() = default;
{
}
std::unique_ptr<CDependencyTree> CWorld::BuildDependencyTree() const std::unique_ptr<CDependencyTree> CWorld::BuildDependencyTree() const
{ {

View File

@ -21,7 +21,7 @@ class CWorld : public CResource
TResPtr<CResource> mpSaveWorld; TResPtr<CResource> mpSaveWorld;
TResPtr<CModel> mpDefaultSkybox; TResPtr<CModel> mpDefaultSkybox;
TResPtr<CResource> mpMapWorld; TResPtr<CResource> mpMapWorld;
uint32 mTempleKeyWorldIndex; uint32 mTempleKeyWorldIndex = 0;
struct STimeAttackData struct STimeAttackData
{ {
@ -31,7 +31,8 @@ class CWorld : public CResource
float SilverTime; float SilverTime;
float GoldTime; float GoldTime;
float ShinyGoldTime; float ShinyGoldTime;
} mTimeAttackData; };
STimeAttackData mTimeAttackData{};
struct SAudioGrp struct SAudioGrp
{ {