summaryrefslogtreecommitdiff
path: root/src/JSystem/JParticle/JPAParticle.cpp
diff options
context:
space:
mode:
authorhatal175 <hatal175@users.noreply.github.com>2024-11-09 20:20:06 +0200
committerGitHub <noreply@github.com>2024-11-09 13:20:06 -0500
commitbec20e3dd462bd9cba86979e471856356c223261 (patch)
treee412bf90b2545376758491938d2476028b9d7717 /src/JSystem/JParticle/JPAParticle.cpp
parent083991a8d08827a1185c8ad12a158bb7b021bee9 (diff)
Work on various units, mostly d_menu_letter (#2240)
Diffstat (limited to 'src/JSystem/JParticle/JPAParticle.cpp')
-rw-r--r--src/JSystem/JParticle/JPAParticle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/JSystem/JParticle/JPAParticle.cpp b/src/JSystem/JParticle/JPAParticle.cpp
index e5b7121d04..5dd398bb11 100644
--- a/src/JSystem/JParticle/JPAParticle.cpp
+++ b/src/JSystem/JParticle/JPAParticle.cpp
@@ -17,7 +17,7 @@ JPAParticleCallBack::~JPAParticleCallBack() {
/* 8027EFEC-8027F8C8 27992C 08DC+00 0/0 1/1 0/0 .text
* init_p__15JPABaseParticleFP18JPAEmitterWorkData */
-// NONMATCHING a couple problems, likely issues with setLength and get_r_ss
+// NONMATCHING a couple problems, likely issues with setLength
void JPABaseParticle::init_p(JPAEmitterWorkData* work) {
JPABaseEmitter* emtr = work->mpEmtr;
JPAExtraShape* esp = work->mpRes->getEsp();
@@ -56,8 +56,8 @@ void JPABaseParticle::init_p(JPAEmitterWorkData* work) {
JGeometry::TVec3<f32> velDir;
if (emtr->mDirSpeed) {
Mtx mtx;
- s16 angleY = emtr->get_r_ss();
- s16 angleZ = emtr->get_r_zp() * 0x8000 * emtr->mSpread;
+ int angleZ = emtr->get_r_ss();
+ f32 angleY = emtr->get_r_zp() * 0x8000 * emtr->mSpread;
JPAGetYZRotateMtx(angleY, angleZ, mtx);
MTXConcat(work->mDirectionMtx, mtx, mtx);
velDir.set(emtr->mDirSpeed * mtx[0][2],