Made giant Shy Guys, also learned about Mario bouncing

1 files changed, 5 insertions, 61 deletions

diff --git a/src/shyguy.cpp b/src/shyguy.cpp
index bbae18b..cb0753a 100644
--- a/src/shyguy.cpp
+++ b/src/shyguy.cpp
@@ -111,7 +111,6 @@ class daShyGuy : public dEn_c {
 	void _vf148();
 	void _vf14C();
 	bool CreateIceActors();
-	void addScoreWhenHit(void *other);
 
 	USING_STATES(daShyGuy);
 	DECLARE_STATE(Walk);
@@ -223,20 +222,6 @@ daShyGuy *daShyGuy::build() {
 			stateVar = &StateID_GoDizzy;
 			deathState = &StateID_Die;
 		}
-		else if (this->type > 8) { // Giants
-			hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 0);
-			if(hitType == 1) {	// regular jump
-				apOther->someFlagByte |= 2;
-			} 
-			else if(hitType == 3) {	// spinning jump or whatever?
-				apOther->someFlagByte |= 2;
-			} 
-			else if(hitType == 0) {
-				this->dEn_c::playerCollision(apThis, apOther);
-				this->_vf220(apOther->owner);
-			} 
-			return;
-		}
 		else { // Ballooneers
 			stateVar = &StateID_BalloonDrop;
 			deathState = &StateID_Die;
@@ -318,9 +303,6 @@ daShyGuy *daShyGuy::build() {
 				this->_vf14C();	
 			}
 		}
-		else if (this->type > 8) { // Giants
-			return;
-		}
 		else { // Ballooneers
 			stateVar = &StateID_FlameHit;
 		}
@@ -354,16 +336,11 @@ daShyGuy *daShyGuy::build() {
 
 	bool daShyGuy::CreateIceActors() {
 		struct DoSomethingCool my_struct = { 0, this->pos, {1.2, 1.5, 1.5}, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
-		if (type > 8) { my_struct.scale = (Vec3){2.4, 3.0, 3.0}; }
 	    this->frzMgr.Create_ICEACTORs( (void*)&my_struct, 1 );
 	    __destroy_arr( (void*)&my_struct, sub_80024C20, 0x3C, 1 );
 	    return true;
 	}
 
-	void daShyGuy::addScoreWhenHit(void *other) {
-		if (type < 9) { dEn_c::addScoreWhenHit(other); }
-	}
-
 bool daShyGuy::calculateTileCollisions() {
 	// Returns true if sprite should turn, false if not.
 
@@ -576,31 +553,10 @@ int daShyGuy::onCreate() {
 
 	ActivePhysics::Info HitMeBaby;
 
-	if (type > 8) {
-		this->scale = (Vec){40.0f, 40.0f, 40.0f};
-
-		HitMeBaby.xDistToCenter = 0.0;
-		HitMeBaby.yDistToCenter = 24.0;
-
-		HitMeBaby.xDistToEdge = 20.0;
-		HitMeBaby.yDistToEdge = 24.0;
-
-		// giantRider.init(this, -19.5f, 18.0f, 19.5f, 18.0f);
-
-		giantRider.init(this, 0.0f, 0.0f, -24.0f, 0.0f, 28.0f, 0, 0);
-		// addToList(&giantRider);
-		giantRider.addToList();
-
-		giantRider.update();
-	}
-
-	else {
-		HitMeBaby.xDistToCenter = 0.0;
-		HitMeBaby.yDistToCenter = 12.0;
-
-		HitMeBaby.xDistToEdge = 10.0;
-		HitMeBaby.yDistToEdge = 12.0;		
-	}
+	HitMeBaby.xDistToCenter = 0.0;
+	HitMeBaby.yDistToCenter = 12.0;
+	HitMeBaby.xDistToEdge = 10.0;
+	HitMeBaby.yDistToEdge = 12.0;		
 
 	HitMeBaby.category1 = 0x3;
 	HitMeBaby.category2 = 0x0;
@@ -692,14 +648,6 @@ int daShyGuy::onCreate() {
 	else if (type == 8) {
 		doStateChange(&StateID_Balloon_C);
 	}		
-	else if (type == 9) {
-		bindAnimChr_and_setUpdateRate("c18_EV_WIN_2_R", 1, 0.0, 1.5); 
-		doStateChange(&StateID_RealWalk);
-	}		
-	else if (type == 10) {
-		bindAnimChr_and_setUpdateRate("c18_EV_WIN_2_R", 1, 0.0, 1.5); 
-		doStateChange(&StateID_Walk);
-	}		
 
 	this->onExecute();
 	return true;
@@ -712,17 +660,13 @@ int daShyGuy::onDelete() {
 int daShyGuy::onExecute() {
 	acState.execute();
 	updateModelMatrices();
-
-	if (type > 8) {
-		giantRider.update();
-	}
+	bodyModel._vf1C();
 
 	return true;
 }
 
 int daShyGuy::onDraw() {
 	bodyModel.scheduleForDrawing();
-	bodyModel._vf1C();
 
 	if (this->renderBalloon == 1) {
 		balloonModel.scheduleForDrawing();