update with fixes

1 files changed, 20 insertions, 7 deletions

diff --git a/src/bossPlayerClown.cpp b/src/bossPlayerClown.cpp
index afa8c3e..e828336 100644
--- a/src/bossPlayerClown.cpp
+++ b/src/bossPlayerClown.cpp
@@ -8,32 +8,44 @@
 
 #define CLOWN_MODEL(clown) ((m3d::mdl_c*)( ((u32)(clown)) + 0xFD0 ))
 
-dEn_c *newClownCtor(dEn_c *clown);
-void newClownDtor(dEn_c *clown, u32 willDelete);
+extern "C" void *PClownCarExecute(dEn_c *clown);
+extern "C" void *PClownCarAfterCreate(dEn_c *clown, u32);
+extern "C" void *PClownCarDraw(dEn_c *clown);
+extern "C" void *PClownCarMove(dEn_c *clown);
 
 void CConDraw(dEn_c *clown) {
 	// setup matrices
-	CLOWN_MODEL(clown)->scheduleForDrawing();
+	OSReport("Drawing");
+	// CLOWN_MODEL(clown)->scheduleForDrawing();
 
+	PClownCarDraw(clown);
 	// run normal clown function
 }
 
 void CConExecute(dEn_c *clown) {
+	OSReport("Executing");
+
+	PClownCarExecute(clown);
 	// run normal execute
 }
 
 void CCafterCreate(dEn_c *clown) {
-	clown->scale.x = clown->scale.x * 1.25;
-	clown->scale.y = clown->scale.y * 1.25;
-	clown->scale.z = clown->scale.z * 1.25;
+	OSReport("Creating");
+
+	clown->scale.x *= 1.25;
+	clown->scale.y *= 1.25;
+	clown->scale.z *= 1.25;
 
 	// setup the model
 
-	// dEn_c::afterCreate(1);
+	PClownCarAfterCreate(clown, 1);
 }
 
 void CConExecuteMove(dEn_c *clown) {
+	OSReport("Moving");
+
 	// run normal move
+	PClownCarMove(clown);
 
 	// check for wiimote button presses
 
@@ -45,6 +57,7 @@ extern "C" m3d::mdl_c *__ct__Q23m3d5mdl_cFv(m3d::mdl_c *mdl);
 extern "C" dEn_c *__ct__20daJrClownForPlayer_cFv(dEn_c *clown);
 
 dEn_c *newClownCtor(dEn_c *clown) {
+	OSReport("ctor");
 	__ct__20daJrClownForPlayer_cFv(clown);
 	__ct__Q23m3d5mdl_cFv(CLOWN_MODEL(clown));
 	return clown;