fixes for using class functions instead of extern'd calls

updated full daEnDosun_c definition
half working daEnMegaDosun_c

1 files changed, 5 insertions, 8 deletions

diff --git a/src/mrsun.cpp b/src/mrsun.cpp
index 8fb4524..a93c06f 100755
--- a/src/mrsun.cpp
+++ b/src/mrsun.cpp
@@ -68,9 +68,6 @@ daMrSun_c *daMrSun_c::build() {
 }
 
 
-extern "C" void *HandleXSpeed(daMrSun_c *);
-extern "C" void *HandleYSpeed(daMrSun_c *);
-extern "C" void *UpdateObjectPosBasedOnSpeedValues_real(daMrSun_c *);
 extern "C" u32 GenerateRandomNumber(int max);
 extern "C" u8 dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(daMrSun_c *, Vec pos);
 extern "C" dStageActor_c *CreateActor(u16 classID, int settings, Vec pos, char rot, char layer);
@@ -364,16 +361,16 @@ void daMrSun_c::executeState_Follow() {
 		if (this->speed.x > 6.0) { this->speed.x = this->speed.x - (speedDelta); }
 	}
 	
-	HandleXSpeed(this);
+	this->HandleXSpeed();
 	
 	
 	float yDiff;
 	yDiff = (this->Baseline - this->pos.y) / 8;
 	this->speed.y = yDiff;
 		
-	HandleYSpeed(this);
+	this->HandleYSpeed();
 
-	UpdateObjectPosBasedOnSpeedValues_real(this);
+	this->UpdateObjectPosBasedOnSpeedValuesReal();
 
 	this->timer = this->timer + 1;
 }
@@ -575,8 +572,8 @@ void daMrSun_c::executeState_Spin() {
 		if (this->speed.x > 80.0) { this->speed.x = this->speed.x - (0.2 * 2); }
 	}
 	
-	HandleXSpeed(this);
-	UpdateObjectPosBasedOnSpeedValues_real(this);
+	this->HandleXSpeed();
+	this->UpdateObjectPosBasedOnSpeedValuesReal();
 
 	this->timer = this->timer + 1;