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

Fix CElectricDescription

This commit is contained in:
Phillip Stephens 2016-02-15 00:33:06 -08:00
parent 1c5a86dcbf
commit 1541b0ab2e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/Particle/CElectricDescription.hpp
View File

@ -20,13 +20,13 @@ public:
std::unique_ptr<CIntElement> xc_SCNT;
std::unique_ptr<CIntElement> x10_SSEG;
std::unique_ptr<CColorElement> 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<CEmitterElement> x18_IEMT;
std::unique_ptr<CEmitterElement> x1c_FEMT;
std::unique_ptr<CRealElement> x20_AMPL;
std::unique_ptr<CRealElement> x24_AMPD;
std::unique_ptr<CRealElement> x28_LWD1;
std::unique_ptr<CRealElement> x2c_LWD2;
std::unique_ptr<CRealElement> x30_LWD3;
std::unique_ptr<CColorElement> x34_LCL1;
std::unique_ptr<CColorElement> x38_LCL2;
std::unique_ptr<CColorElement> x3c_LCL3;

14
Runtime/Particle/CParticleElectricDataFactory.cpp
View File

@ -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));