diff --git a/Source/Contents/Effects/RagEffect.cpp b/Source/Contents/Effects/RagEffect.cpp index 9b2c5a5f..9dae2706 100644 --- a/Source/Contents/Effects/RagEffect.cpp +++ b/Source/Contents/Effects/RagEffect.cpp @@ -3822,7 +3822,7 @@ void CRagEffect::TexturedSwirl(unsigned char clockwise, const char* name) { // OFFSET: 0x00C470D0 // FUNCTION: fn_20155 -void CRagEffect::TexturedFlare(const char* name, char size) { +void CRagEffect::TexturedFlare(const char* name, char size, int, int) { const RenderObjectState& parent = this->state.parent->render; this->render.position.x = parent.position.x; this->render.position.y = parent.position.y; @@ -4333,7 +4333,7 @@ void CRagEffect::TexturedCrossFade(const char* name) { this->state.unknown_11C84->slots[index].alphaB = 0; this->state.unknown_11C84->slots[index].distance = 20.0f - static_cast(index) * 0.5f; this->state.unknown_11C84->slots[index].riseAngle = 50; - this->state.unknown_11C84->slots[index].vecBNow.z = 0.0f; + this->state.unknown_11C84->slots[index].vecBNow.y = 0.0f; for (int height = 0; height < 21; ++height) { this->state.unknown_11C84->slots[index].height[height] = 0.0f; @@ -4580,7 +4580,7 @@ void CRagEffect::TexturedGlow(const char* name, char size) { this->state.unknown_11C84->slots[0].alphaB = static_cast(50 - std::max(rand() % 10, 0)); this->state.unknown_11C84->slots[0].riseAngle = 90; this->state.unknown_11C84->slots[0].alphaT = static_cast(std::max(rand() % 360, 0)); - this->state.unknown_11C84->slots[0].vecBNow.z = 0.0f; + this->state.unknown_11C84->slots[0].vecBNow.y = 0.0f; for (int index = 0; index < 21; ++index) { this->state.unknown_11C84->slots[0].height[index] = 0.0f; @@ -4827,7 +4827,7 @@ void CRagEffect::TexturedCrossStaged(const char* name, char level) { // OFFSET: 0x00C4E3F0 // FUNCTION: fn_20177 -void CRagEffect::ElectricArc(char kind) { +void CRagEffect::ElectricArc(char kind, std::int16_t) { const RenderObjectState& parent = this->state.parent->render; this->render.position.x = parent.position.x; this->render.position.y = parent.position.y; diff --git a/Source/Contents/Effects/RagEffect.h b/Source/Contents/Effects/RagEffect.h index be4905f6..fafcd032 100644 --- a/Source/Contents/Effects/RagEffect.h +++ b/Source/Contents/Effects/RagEffect.h @@ -69,7 +69,7 @@ struct CRagEffect : CRenderObject { void TexturedComet(const char* name, char kind); void WhiteSpray(char kind); void BlueRingStack(); - void ElectricArc(char kind); + void ElectricArc(char kind, std::int16_t); void TexturedCrossStaged(const char* name, char level); void TexturedShieldThrow(const char* name); void LineStreakKind(std::int16_t kind); @@ -87,7 +87,7 @@ struct CRagEffect : CRenderObject { void TexturedOrbit(const char* name); void TexturedSlashCross(const char* name); void TexturedHalo(const char* name, char kind); - void TexturedFlare(const char* name, char size); + void TexturedFlare(const char* name, char size, int, int); void TexturedSwirl(unsigned char clockwise, const char* name); void TexturedBeams(const char* name, char flag); void TexturedSlashWave(const char* name, char kind);