Match daNpc_Cb1_c::flyAction

.vscode/settings.json

@@ -28,7 +28,6 @@
     "build/*/report.json": true,
     "build/**/*.MAP": true,
     "build/*/include/assets/**": true,
-    "build/*/include/pch/**": true,
     "build.ninja": true,
     ".ninja_*": true,
     "objdiff.json": true,

include/d/actor/d_a_npc_cb1.h

@@ -136,7 +136,7 @@ public:
     BOOL sowCheck();
     BOOL shipRideCheck();
     BOOL eventProc();
-    BOOL evCheckDisp(int);
+    void evCheckDisp(int);
     void evInitWait(int);
     BOOL evActWait(int);
     void evInitMsgSet(int);

src/d/actor/d_a_npc_cb1.cpp

@@ -633,8 +633,6 @@ void daNpc_Cb1_c::breaking() {
 
 /* 00001B68-0000270C       .text flyAction__11daNpc_Cb1_cFifsi */
 BOOL daNpc_Cb1_c::flyAction(BOOL param_1, f32 param_2, s16 param_3, BOOL param_4) {
-    /* Nonmatching */
-
     bool isMakarPlayer = dComIfGp_getPlayer(0) == this;
     f32 ySpeedLimit = l_HIO.field_0x98;
     f32 temp3 = m8F8 * l_HIO.field_0x8C;
@@ -699,12 +697,9 @@ BOOL daNpc_Cb1_c::flyAction(BOOL param_1, f32 param_2, s16 param_3, BOOL param_4
 
         s16 angle = cM_atan2s(temp.x, temp.z);
 
-        f32 temp6 = std::sqrtf(SQUARE(temp.x) + SQUARE(temp.z));
-        if (temp6 > temp5) {
-            temp6 = temp5;
-        }
+        f32 temp6_2 = cLib_maxLimit(std::sqrtf(SQUARE(temp.x) + SQUARE(temp.z)), temp5);
         angle = angle - shape_angle.y;
-        temp6 *= l_HIO.field_0xA8;
+        f32 temp6 = temp6_2 * l_HIO.field_0xA8;
         if (temp6 > 14000.0f) {
             temp6 = 14000.0f;
         }
@@ -1072,7 +1067,7 @@ BOOL daNpc_Cb1_c::eventProc() {
 }
 
 /* 00002DC8-00002E5C       .text evCheckDisp__11daNpc_Cb1_cFi */
-BOOL daNpc_Cb1_c::evCheckDisp(int staffIdx) {
+void daNpc_Cb1_c::evCheckDisp(int staffIdx) {
     int* pDisp = dComIfGp_evmng_getMyIntegerP(staffIdx, "Disp");
     if(pDisp) {
         if(*pDisp) {

src/d/actor/d_a_obj_eff.cpp

@@ -250,8 +250,8 @@ BOOL daObjEff::Act_c::eff_set_woodBox_smoke() {
     JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &current.pos,
                                                         NULL,  NULL, 0xB4, mParticleCallback, -1, NULL, NULL, &particle_scl);
     if (emitter != NULL) {
-        emitter->mRate = 30.0f;
-        emitter->mMaxFrame = 1;
+        emitter->setRate(30.0f);
+        emitter->setMaxFrame(1);
         return true;
     }