AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-12 22:56:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Loading SCLY file properties into a new class CResourceInfo instead of loading it as a CResource

Browse Source
This commit is contained in:
parax0
2016-01-10 08:57:21 -07:00
parent b768473b44
commit 29bf0234ec
15 changed files with 163 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/ScriptExtra/CDamageableTriggerExtra.cpp
View File

@@ -167,7 +167,7 @@ void CDamageableTriggerExtra::PropertyModified(IProperty *pProperty)
{
if (pProperty == mpTextureProps[iTex])
{
mpTextures[iTex] = mpTextureProps[iTex]->Get();
mpTextures[iTex] = mpTextureProps[iTex]->Get().Load();
if (mpTextures[iTex] && mpTextures[iTex]->Type() != eTexture)
mpTextures[iTex] = nullptr;

2
src/Core/ScriptExtra/CDoorExtra.cpp
View File

@@ -41,7 +41,7 @@ void CDoorExtra::PropertyModified(IProperty *pProperty)
{
if (pProperty == mpShieldModelProp)
{
mpShieldModel = mpShieldModelProp->Get();
mpShieldModel = mpShieldModelProp->Get().Load();
if (mpShieldModel)
mLocalAABox = mpShieldModel->AABox();

2
src/Core/ScriptExtra/CPointOfInterestExtra.cpp
View File

@@ -42,7 +42,7 @@ CPointOfInterestExtra::CPointOfInterestExtra(CScriptObject *pInstance, CScene *p
void CPointOfInterestExtra::PropertyModified(IProperty* pProperty)
{
if (mpScanProperty == pProperty)
mpScanData = mpScanProperty->Get();
mpScanData = mpScanProperty->Get().Load();
}
void CPointOfInterestExtra::ModifyTintColor(CColor& Color)