obj_mkiek demo match, remove fake inlines from cXyz

6 files changed, 31 insertions, 14 deletions

diff --git a/src/SSystem/SComponent/c_m3d_g_aab.cpp b/src/SSystem/SComponent/c_m3d_g_aab.cpp
index 1d89a243..4932804d 100644
--- a/src/SSystem/SComponent/c_m3d_g_aab.cpp
+++ b/src/SSystem/SComponent/c_m3d_g_aab.cpp
@@ -13,10 +13,26 @@ void cM3dGAab::SetMinMax(const cXyz& pMinMax) {
 
 /* 80251D08-80251D48       .text SetMin__8cM3dGAabFRC4cXyz */
 void cM3dGAab::SetMin(const cXyz& pMin) {
-    mMin.setMin(pMin);
+    if (mMin.x > pMin.x) {
+        mMin.x = pMin.x;
+    }
+    if (mMin.y > pMin.y) {
+        mMin.y = pMin.y;
+    }
+    if (mMin.z > pMin.z) {
+        mMin.z = pMin.z;
+    }
 }
 
 /* 80251D48-80251D88       .text SetMax__8cM3dGAabFRC4cXyz */
 void cM3dGAab::SetMax(const cXyz& pMax) {
-    mMax.setMax(pMax);
+    if (mMax.x < pMax.x) {
+        mMax.x = pMax.x;
+    }
+    if (mMax.y < pMax.y) {
+        mMax.y = pMax.y;
+    }
+    if (mMax.z < pMax.z) {
+        mMax.z = pMax.z;
+    }
 }
diff --git a/src/d/actor/d_a_acorn_leaf.cpp b/src/d/actor/d_a_acorn_leaf.cpp
index ce929193..e1730d1b 100644
--- a/src/d/actor/d_a_acorn_leaf.cpp
+++ b/src/d/actor/d_a_acorn_leaf.cpp
@@ -9,7 +9,7 @@
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/J3DGraphANimator/J3DModel.h"
+#include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "d/actor/d_a_tsubo.h"
 #include "d/actor/d_a_player.h"
 #include "d/res/res_vigah.h"
@@ -151,8 +151,7 @@ void daAleaf_c::set_mtx() {
 /* 000008D0-00000C44       .text _execute__9daAleaf_cFv */
 bool daAleaf_c::_execute() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
-    fpc_ProcID sp14 = unk_424;
-    fopAc_ac_c* actor = fopAcM_Search(fpcSch_JudgeByID, &sp14);
+    fopAc_ac_c* actor = fopAcM_SearchByID(unk_424);
     
     bool var_r29 = false;
 
@@ -180,7 +179,7 @@ bool daAleaf_c::_execute() {
         unk_408.setPlaySpeed(1.0f);
     }
 
-    f32 var_f31 = std::sqrtf((player->current.pos - current.pos).getMagXZ());
+    f32 var_f31 = (player->current.pos - current.pos).absXZ();
 
     if (var_f31 < 50.0f && (unk_42C - var_f31) > 3.0f && std::fabsf(player->current.pos.y - current.pos.y) < 5.0f) {
         unk_418 = true;
@@ -188,11 +187,10 @@ bool daAleaf_c::_execute() {
     }
 
     if (var_f31 < 200.0f && unk_428 != player->getGrabActorID() && player->getGrabActorID() == fpcM_ERROR_PROCESS_ID_e) {
-        fpc_ProcID sp14 = unk_428;
-        fopAc_ac_c* actor = fopAcM_Search(fpcSch_JudgeByID, &sp14);
+        fopAc_ac_c* actor = fopAcM_SearchByID(unk_428);
 
         if (actor != NULL) {
-            f32 var_f1 = std::sqrtf((actor->current.pos - current.pos).getMagXZ());
+            f32 var_f1 = (actor->current.pos - current.pos).absXZ();
             
             if (var_f1 < 70.0f) {
                 unk_418 = true;
diff --git a/src/d/actor/d_a_obj_mkiek.cpp b/src/d/actor/d_a_obj_mkiek.cpp
index cee4a23c..271bd78d 100644
--- a/src/d/actor/d_a_obj_mkiek.cpp
+++ b/src/d/actor/d_a_obj_mkiek.cpp
@@ -109,7 +109,7 @@ BOOL daObjMkiek::Act_c::Delete() {
 BOOL daObjMkiek::Act_c::Mthd_Delete() {
     BOOL result = this->MoveBGDelete();
     if (fpcM_CreateResult(this) != cPhs_STOP_e) {
-        dComIfG_resDelete(&mPhs, M_arcname);
+        dComIfG_resDeleteDemo(&mPhs, M_arcname);
     }
     return result;
 }
@@ -150,6 +150,9 @@ void daObjMkiek::Act_c::demo_wait() {
         if (prm_get_sound() == 0) {
             mDoAud_seStart(JA_SE_READ_RIDDLE_1);
         }
+#if VERSION == VERSION_DEMO
+        dComIfGp_getVibration().StartShock(4, -0x21, cXyz(0.0f, 1.0f, 0.0f));
+#endif
         if (m460 < 0x14) {
             m460++;
         } else {
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 076ce0c6..472aec73 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -2612,7 +2612,7 @@ void daPy_lk_c::posMove() {
         }
     }
     m3644 = 0.0f;
-    mStts.GetCCMoveP()->zero();
+    mStts.GetCCMoveP()->x = mStts.GetCCMoveP()->y = mStts.GetCCMoveP()->z = 0.0f;
     if (m34C2 == 1 || m34C2 == 8 || m34C2 == 9 || m34C2 == 5) {
         cXyz sp5C;
         if (m34C2 == 1 || m34C2 == 5) {
diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp
index ab77ab13..f4503582 100644
--- a/src/d/actor/d_a_sea.cpp
+++ b/src/d/actor/d_a_sea.cpp
@@ -227,7 +227,7 @@ void daSea_packet_c::CleanUp() {
     for (s32 z = 0; z < GRID_CELLS; z++)
         for (s32 x = 0; x < GRID_CELLS; x++)
             mpHeightTable[idx++] = BASE_HEIGHT;
-    mCurPos.zero();
+    mCurPos.x = mCurPos.y = mCurPos.z = 0.0f;
 }
 
 /* 8015B7E4-8015B84C       .text __ct__14daSea_packet_cFv */
diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp
index 84f52469..3bc65a38 100644
--- a/src/d/d_kankyo_rain.cpp
+++ b/src/d/d_kankyo_rain.cpp
@@ -883,7 +883,7 @@ void wave_move() {
     }
 
     dKy_set_eyevect_calc2(pCamera, &eyevect, g_env_light.mWaveChan.mWaveSpawnDist, 0.0f);
-    d0.zero();
+    d0.x = d0.y = d0.z = 0.0f;
 
     windVecP = dKyw_get_wind_vec();
     windPow = dKyw_get_wind_pow();
@@ -924,7 +924,7 @@ void wave_move() {
         windPow = 0.6f;
     }
 
-    d0.zero();
+    d0.x = d0.y = d0.z = 0.0f;
 
     deltaXZ.x = pCamera->mLookat.mCenter.x - pCamera->mLookat.mEye.x;
     deltaXZ.y = 0.0f;