From 9456881d2e93fb90683ba00bebaabfd03c26713a Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 4 Feb 2023 16:08:25 -0700 Subject: [PATCH] comment out d_a_swim --- include/JSystem/JParticle/JPAParticle.h | 8 ++++---- rel/d/a/d_a_do/d_a_do.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h index 958f6ed63c1..31590055f20 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/include/JSystem/JParticle/JPAParticle.h @@ -237,10 +237,10 @@ public: void setRate(f32 rate) { mRate = rate; } void setEmitterCallBackPtr(JPAEmitterCallBack* ptr) { mpEmtrCallBack = ptr; } void setGlobalRTMatrix(const Mtx m) { JPASetRMtxTVecfromMtx(m, mGlobalRot, &mGlobalTrs); } - void setGlobalScale(const JGeometry::TVec3& scale) { - mGlobalScl = scale; - mGlobalPScl = scale; - } + // void setGlobalScale(const JGeometry::TVec3& scale) { + // mGlobalScl = scale; + // mGlobalPScl = scale; + // } f32 get_r_f() { return mRndm.get_rndm_f(); } f32 get_r_zp() { return mRndm.get_rndm_zp(); } diff --git a/rel/d/a/d_a_do/d_a_do.cpp b/rel/d/a/d_a_do/d_a_do.cpp index 6eddc7fd1f9..a00002bb626 100644 --- a/rel/d/a/d_a_do/d_a_do.cpp +++ b/rel/d/a/d_a_do/d_a_do.cpp @@ -2326,7 +2326,7 @@ COMPILER_STRIP_GATE(0x8066EF5C, &lit_5407); #pragma pop /* 8066C894-8066CAA8 004C34 0214+00 1/1 0/0 0/0 .text do_a_swim__FP8do_class */ -#ifndef NONMATCHING +#ifdef NONMATCHING static void do_a_swim(do_class* i_dogP) { i_dogP->field_0x648 = 2000.0; cLib_addCalc0(&i_dogP->mSpeedF,1.0,1.0);