From 1541b0ab2e65e25aaf8771e1de1ba46cbafa544d Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Mon, 15 Feb 2016 00:33:06 -0800 Subject: [PATCH] Fix CElectricDescription --- Runtime/Particle/CElectricDescription.hpp | 14 +++++++------- Runtime/Particle/CParticleElectricDataFactory.cpp | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Runtime/Particle/CElectricDescription.hpp b/Runtime/Particle/CElectricDescription.hpp index 27fc0fbac..3a83ad9c0 100644 --- a/Runtime/Particle/CElectricDescription.hpp +++ b/Runtime/Particle/CElectricDescription.hpp @@ -20,13 +20,13 @@ public: std::unique_ptr xc_SCNT; std::unique_ptr x10_SSEG; std::unique_ptr x14_COLR; - bool x18_IEMT; - bool x1c_FEMT; - bool x20_AMPL; - bool x24_AMPD; - bool x28_LWD1; - bool x2c_LWD2; - bool x30_LWD3; + std::unique_ptr x18_IEMT; + std::unique_ptr x1c_FEMT; + std::unique_ptr x20_AMPL; + std::unique_ptr x24_AMPD; + std::unique_ptr x28_LWD1; + std::unique_ptr x2c_LWD2; + std::unique_ptr x30_LWD3; std::unique_ptr x34_LCL1; std::unique_ptr x38_LCL2; std::unique_ptr x3c_LCL3; diff --git a/Runtime/Particle/CParticleElectricDataFactory.cpp b/Runtime/Particle/CParticleElectricDataFactory.cpp index b2e640c77..9ee82d4f8 100644 --- a/Runtime/Particle/CParticleElectricDataFactory.cpp +++ b/Runtime/Particle/CParticleElectricDataFactory.cpp @@ -58,25 +58,25 @@ bool CParticleElectricDataFactory::CreateELSM(CElectricDescription *desc, CInput desc->x14_COLR.reset(CPF::GetColorElement(in)); break; case SBIG('IEMT'): - desc->x18_IEMT = CPF::GetBool(in); + desc->x18_IEMT.reset(CPF::GetEmitterElement(in)); break; case SBIG('FEMT'): - desc->x1c_FEMT = CPF::GetBool(in); + desc->x1c_FEMT.reset(CPF::GetEmitterElement(in)); break; case SBIG('AMPL'): - desc->x20_AMPL = CPF::GetBool(in); + desc->x20_AMPL.reset(CPF::GetRealElement(in)); break; case SBIG('AMPD'): - desc->x24_AMPD = CPF::GetBool(in); + desc->x24_AMPD.reset(CPF::GetRealElement(in)); break; case SBIG('LWD1'): - desc->x28_LWD1 = CPF::GetBool(in); + desc->x28_LWD1.reset(CPF::GetRealElement(in)); break; case SBIG('LWD2'): - desc->x2c_LWD2 = CPF::GetBool(in); + desc->x2c_LWD2.reset(CPF::GetRealElement(in)); break; case SBIG('LWD3'): - desc->x30_LWD3 = CPF::GetBool(in); + desc->x30_LWD3.reset(CPF::GetRealElement(in)); break; case SBIG('LCL1'): desc->x34_LCL1.reset(CPF::GetColorElement(in));