AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CScriptLoader: Make use of in-class initializers 

Same behavior, less code.
This commit is contained in:
Lioncash 2020-06-19 20:23:03 -04:00
parent 7629f15f40
commit 888ceb55d5
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Core/Resource/Factory/CScriptLoader.cpp
View File

@ -7,17 +7,12 @@
#include "Core/Resource/Script/Property/CEnumProperty.h" #include "Core/Resource/Script/Property/CEnumProperty.h"
#include "Core/Resource/Script/Property/CFlagsProperty.h" #include "Core/Resource/Script/Property/CFlagsProperty.h"
#include <Common/Log.h> #include <Common/Log.h>
#include <iostream>
#include <sstream> #include <sstream>
// Whether to ensure the values of enum/flag properties are valid // Whether to ensure the values of enum/flag properties are valid
#define VALIDATE_PROPERTY_VALUES 1 #define VALIDATE_PROPERTY_VALUES 1
CScriptLoader::CScriptLoader() CScriptLoader::CScriptLoader() = default;
: mpObj(nullptr)
, mpCurrentData(nullptr)
{
}
void CScriptLoader::ReadProperty(IProperty *pProp, uint32 Size, IInputStream& rSCLY) void CScriptLoader::ReadProperty(IProperty *pProp, uint32 Size, IInputStream& rSCLY)
{ {

12
src/Core/Resource/Factory/CScriptLoader.h
View File

@ -10,14 +10,14 @@
class CScriptLoader class CScriptLoader
{ {
EGame mVersion; EGame mVersion{};
CScriptObject* mpObj; CScriptObject* mpObj = nullptr;
CScriptLayer* mpLayer; CScriptLayer* mpLayer = nullptr;
CGameArea* mpArea; CGameArea* mpArea = nullptr;
CGameTemplate *mpGameTemplate; CGameTemplate *mpGameTemplate = nullptr;
// Current data pointer // Current data pointer
void* mpCurrentData; void* mpCurrentData = nullptr;
CScriptLoader(); CScriptLoader();
void ReadProperty(IProperty* pProp, uint32 Size, IInputStream& rSCLY); void ReadProperty(IProperty* pProp, uint32 Size, IInputStream& rSCLY);