diff --git a/configure.py b/configure.py index 17131f2f..cb892475 100755 --- a/configure.py +++ b/configure.py @@ -603,7 +603,7 @@ LIBS = [ ["Kyoto/Particles/CParticleGlobals", True], "Kyoto/Particles/CParticleSwoosh", "Kyoto/Particles/CParticleSwooshDataFactory", - ["Kyoto/Particles/CRealElement", False], + ["Kyoto/Particles/CRealElement", True], "Kyoto/Particles/CSpawnSystemKeyframeData", "Kyoto/Particles/CUVElement", "Kyoto/Particles/CVectorElement", diff --git a/obj_files.mk b/obj_files.mk index f6074de3..8fdb7af8 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -542,7 +542,7 @@ KYOTO_1 :=\ $(BUILD_DIR)/src/Kyoto/Particles/CParticleGlobals.o\ $(BUILD_DIR)/asm/Kyoto/Particles/CParticleSwoosh.o\ $(BUILD_DIR)/asm/Kyoto/Particles/CParticleSwooshDataFactory.o\ - $(BUILD_DIR)/asm/Kyoto/Particles/CRealElement.o\ + $(BUILD_DIR)/src/Kyoto/Particles/CRealElement.o\ $(BUILD_DIR)/asm/Kyoto/Particles/CSpawnSystemKeyframeData.o\ $(BUILD_DIR)/asm/Kyoto/Particles/CUVElement.o\ $(BUILD_DIR)/asm/Kyoto/Particles/CVectorElement.o\ diff --git a/src/Kyoto/Particles/CRealElement.cpp b/src/Kyoto/Particles/CRealElement.cpp index c89aceaf..e61affc7 100644 --- a/src/Kyoto/Particles/CRealElement.cpp +++ b/src/Kyoto/Particles/CRealElement.cpp @@ -534,7 +534,7 @@ CREIntTimesReal::~CREIntTimesReal() { bool CREIntTimesReal::GetValue(int frame, float& valOut) const { int a = 0; - float b = 0.f; + float b = 1.f; x8_b->GetValue(frame, b); x4_a->GetValue(frame, a); valOut = b * static_cast< float >(a);