fixes for using class functions instead of extern'd calls

updated full daEnDosun_c definition
half working daEnMegaDosun_c

1 files changed, 11 insertions, 12 deletions

diff --git a/src/bossWrenchThrow.cpp b/src/bossWrenchThrow.cpp
index beea815..6ce36f6 100644
--- a/src/bossWrenchThrow.cpp
+++ b/src/bossWrenchThrow.cpp
@@ -48,11 +48,7 @@ CREATE_STATE(daWrench, Straight);
 
 
 extern "C" void *PlaySound(dEn_c *, int soundID);
-extern "C" void *UpdateObjectPosBasedOnSpeedValues_real(daWrench *);
 extern "C" dStageActor_c *GetSpecificPlayerActor(int number);
-extern "C" void *HandleXSpeed(daWrench *);
-extern "C" void *HandleYSpeed(daWrench *);
-
 
 
 void daWrench::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) { 
@@ -61,10 +57,10 @@ void daWrench::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) {
 	
 	this->isDead = 0;
 	this->flags_4FC |= (1<<(31-7));
-	if(apOther->owner->_38D > 3) {
-		OSReport("!!!ATTENTION!!!\napOther->owner->_38D > 3\n");
+	if(apOther->owner->which_player > 3) {
+		OSReport("!!!ATTENTION!!!\napOther->owner->which_player > 3\n");
 	}else{
-		this->counter_504[apOther->owner->_38D] = 0;
+		this->counter_504[apOther->owner->which_player] = 0;
 	}
 }
 
@@ -78,7 +74,8 @@ void daWrench::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOth
 
 	PlaySound(this, SE_BOSS_JR_FLOOR_BREAK);
 
-	this->Delete();
+	//FIXME changed to dStageActor_c::Delete(u8) from fBase_c(void)
+	this->Delete(this->_390);
 }
 void daWrench::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther) {}
 
@@ -266,14 +263,15 @@ void daWrench::executeState_Homing() {
 	
 	this->pos.y += this->ymod * this->lifespan / 360;
 
-	UpdateObjectPosBasedOnSpeedValues_real(this);
+	this->UpdateObjectPosBasedOnSpeedValuesReal();
 	
 	if (this->lifespan < 1) {
 		
 		PlaySound(this, SE_OBJ_HAMMER_HIT_BOTH);
 
 		CreateEffect(&this->pos, &(S16Vec){0,0,0}, &(Vec){1.5, 1.5, 1.5}, 242);
-		this->Delete();
+		//FIXME changed to dStageActor_c::Delete(u8) from fBase_c(void)
+		this->Delete(this->_390);
 	}
 
 	PlaySound(this, SE_EMY_CHOROPU_M_SPANNER);
@@ -316,7 +314,7 @@ void daWrench::executeState_Straight() {
 		this->rot.z += 0x1000; }	
 	
 
-	UpdateObjectPosBasedOnSpeedValues_real(this);
+	this->UpdateObjectPosBasedOnSpeedValuesReal();
 	
 	PlaySound(this, SE_EMY_CHOROPU_M_SPANNER);
 
@@ -327,7 +325,8 @@ void daWrench::executeState_Straight() {
 		PlaySound(this, SE_OBJ_HAMMER_HIT_BOTH);
 
 		CreateEffect(&this->pos, &(S16Vec){0,0,0}, &(Vec){0.75, 0.75, 0.75}, 242);
-		this->Delete();
+		//FIXME changed to dStageActor_c::Delete(u8) from fBase_c(void)
+		this->Delete(this->_390);
 	}
 
 	this->lifespan -= 1;