relink odoMeter.cpp

projectPiki · Jan 2, 2024 · 6416293 · 6416293
1 parent 824cb37
commit 6416293
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/configure.py b/configure.py
@@ -249,7 +249,7 @@
             ["plugPikiKando/aiAction", False],
             ["plugPikiKando/pikiInf", False],
             ["plugPikiKando/piki", False],
-            ["plugPikiKando/odoMeter", False],
+            ["plugPikiKando/odoMeter", True],
             ["plugPikiKando/pikidoKill", False],
             ["plugPikiKando/pikiMgr", False],
             ["plugPikiKando/pikiState", False],

diff --git a/include/odoMeter.h b/include/odoMeter.h
@@ -1,8 +1,8 @@
 #ifndef _ODOMETER_H
 #define _ODOMETER_H
+
 #include "types.h"
 #include "Vector3f.h"
-#include "math.h"
 
 struct OdoMeter { // TODO: figure out what these actually are
 	float _00;    // _00

diff --git a/src/plugPikiKando/Makefile b/src/plugPikiKando/Makefile
@@ -80,7 +80,7 @@ KANDO_FILES:=\
 	$(BUILD_DIR)/asm/plugPikiKando/aiAction.o\
 	$(BUILD_DIR)/asm/plugPikiKando/pikiInf.o\
 	$(BUILD_DIR)/asm/plugPikiKando/piki.o\
-	$(BUILD_DIR)/asm/plugPikiKando/odoMeter.o\
+	$(BUILD_DIR)/src/plugPikiKando/odoMeter.o\
 	$(BUILD_DIR)/asm/plugPikiKando/pikidoKill.o\
 	$(BUILD_DIR)/asm/plugPikiKando/pikiMgr.o\
 	$(BUILD_DIR)/asm/plugPikiKando/pikiState.o\

diff --git a/src/plugPikiKando/odoMeter.cpp b/src/plugPikiKando/odoMeter.cpp
@@ -1,7 +1,6 @@
 #include "types.h"
 #include "system.h"
 #include "odoMeter.h"
-
 /*
  * --INFO--
  * Address:	........
@@ -45,7 +44,6 @@ void OdoMeter::start(float argA, float argB)
 	_08 = argB;
 	_00 = 0.0;
 }
-
 /*
  * --INFO--
  * Address:	800CD82C
@@ -54,17 +52,17 @@ void OdoMeter::start(float argA, float argB)
  */
 bool OdoMeter::moving(Vector3f& argA, Vector3f& argB)
 {
+	Vector3f vec;
 	float dummy[4]; // Match stack allocation
-
 	unknown1();
-
 	if (_00 < 100.0f) {
-		// THIS IS VECTOR3F::DISTANCE!!! WHAT THE FUUUUUUUUUU
-		Vector3f vec;
-		vec.sub2(argA, argB);
-		f32 distance = vec.length();
+		vec.y          = Vector3f_diffY(argA, argB);
+		vec.x          = Vector3f_diffX(argA, argB);
+		vec.z          = Vector3f_diffZ(argA, argB);
+		float distance = sqrtf(vec.x * vec.x + vec.y * vec.y + vec.z * vec.z);
 		_00 += distance;
+
 	}
-
 	return unknown2();
+
 }