1 files changed, 15 insertions, 19 deletions

diff --git a/src/bossFuzzyBear.cpp b/src/bossFuzzyBear.cpp
index 7bb7e8b..1b9cc99 100644
--- a/src/bossFuzzyBear.cpp
+++ b/src/bossFuzzyBear.cpp
@@ -66,10 +66,6 @@ daFuzzyBear_c *daFuzzyBear_c::build() {
 }
 
 
-extern "C" void *HandleXSpeed(daFuzzyBear_c *);
-extern "C" void *HandleYSpeed(daFuzzyBear_c *);
-extern "C" void *UpdateObjectPosBasedOnSpeedValues_real(daFuzzyBear_c *);
-extern "C" void *doSpriteMovement(dEn_c *);
 extern "C" void *PlaySound(daFuzzyBear_c *, int soundID);
 extern "C" void *StopSound(int soundID);
 
@@ -123,8 +119,8 @@ void daFuzzyBear_c::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhy
 	if (blah->speed.y < 0) {
 		blah->speed.y = -blah->speed.y; }
 	
-	doSpriteMovement(blah);
-	doSpriteMovement(blah);
+	blah->doSpriteMovement();
+	blah->doSpriteMovement();
 	
 	if (this->isInvulnerable == 1) { 
 		
@@ -455,10 +451,10 @@ void daFuzzyBear_c::executeState_Bounce() {
 	else { this->speed.y = this->speed.y - 0.1; } // Gravity 
 
 		
-	HandleXSpeed(this);
-	HandleYSpeed(this);
+	this->HandleXSpeed();
+	this->HandleYSpeed();
 
-	UpdateObjectPosBasedOnSpeedValues_real(this);
+	this->UpdateObjectPosBasedOnSpeedValuesReal();
 
 }
 
@@ -533,10 +529,10 @@ void daFuzzyBear_c::executeState_Needles() {
 	}
 	else { doStateChange(&StateID_Bounce); }
 
-	HandleXSpeed(this);
-	HandleYSpeed(this);
+	this->HandleXSpeed();
+	this->HandleYSpeed();
 
-	UpdateObjectPosBasedOnSpeedValues_real(this);
+	this->UpdateObjectPosBasedOnSpeedValuesReal();
 
 }
 void daFuzzyBear_c::endState_Needles() { OSReport("Fuzzy Needle State End"); }
@@ -587,10 +583,10 @@ void daFuzzyBear_c::executeState_Spray() {
 	else { this->speed.y = this->speed.y - 0.1; } // Gravity 
 
 
-	HandleXSpeed(this);
-	HandleYSpeed(this);
+	this->HandleXSpeed();
+	this->HandleYSpeed();
 
-	UpdateObjectPosBasedOnSpeedValues_real(this);
+	this->UpdateObjectPosBasedOnSpeedValuesReal();
 
 }
 void daFuzzyBear_c::endState_Spray() { 
@@ -679,11 +675,11 @@ void daFuzzyBear_c::executeState_RolyPoly() {
 
 
 
-//	HandleXSpeed(this);
-//	HandleYSpeed(this);
+//	this->HandleXSpeed();
+//	this->HandleYSpeed();
 
-//	doSpriteMovement(this);
-//	UpdateObjectPosBasedOnSpeedValues_real(this);
+//	this->doSpriteMovement();
+//	this->UpdateObjectPosBasedOnSpeedValuesReal();
 	
  }
 void daFuzzyBear_c::endState_RolyPoly() {