From 349ad50d3daefca5dfed6a79d03c6058aae7c581 Mon Sep 17 00:00:00 2001
From: Colin Noga <Tempus@chronometry.ca>
Date: Sat, 1 Sep 2012 22:06:48 -0500
Subject: Fixes to shy guy, more music added, bone platform flip added

---
 src/shyguy.cpp | 48 ++++++++++++++++++++----------------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

(limited to 'src/shyguy.cpp')

diff --git a/src/shyguy.cpp b/src/shyguy.cpp
index d93d77a..2c71252 100644
--- a/src/shyguy.cpp
+++ b/src/shyguy.cpp
@@ -105,6 +105,13 @@ class daShyGuy : public dEn_c {
 	void collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther);
 	void collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther);
 
+	void collisionCat5_Mario(ActivePhysics *apThis, ActivePhysics *apOther);
+	void _vf108(ActivePhysics *apThis, ActivePhysics *apOther);
+	void _vf110(ActivePhysics *apThis, ActivePhysics *apOther);
+	void collisionCat8_FencePunch(ActivePhysics *apThis, ActivePhysics *apOther);
+	void _vf120(ActivePhysics *apThis, ActivePhysics *apOther);
+	void collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther);
+
 	void _vf148();
 	void _vf14C();
 
@@ -207,7 +214,6 @@ daShyGuy *daShyGuy::build() {
 	}
 
 	void daShyGuy::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) {
-
 		dStateBase_c *stateVar;
 		dStateBase_c *deathState;
 		
@@ -280,43 +286,29 @@ daShyGuy *daShyGuy::build() {
 			this->_vf220(apOther->owner);
 		} 
 		// else if(hitType == 2) { \\ Minimario? } 
-
-
-	}
-
-	void daShyGuy::yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther) {
-		this->playerCollision(apThis, apOther);
 	}
 
-	void daShyGuy::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) {
-		doStateChange(&StateID_Die);
-	}
-
-	void daShyGuy::collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther) {
-		doStateChange(&StateID_Die);
-	}
+	void daShyGuy::yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther) { this->playerCollision(apThis, apOther); }
+	void daShyGuy::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { doStateChange(&StateID_Die); }
+	void daShyGuy::collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther) { doStateChange(&StateID_Die); }
+	void daShyGuy::collisionCat7_WMWaggleWaterYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { doStateChange(&StateID_Die); }
+	void daShyGuy::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { doStateChange(&StateID_Die); }
 
-	void daShyGuy::collisionCat7_WMWaggleWaterYoshi(ActivePhysics *apThis, ActivePhysics *apOther) {
-		doStateChange(&StateID_Die);
-	}
+	void daShyGuy::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther){ doStateChange(&StateID_Die); }
+	void daShyGuy::collisionCat5_Mario(ActivePhysics *apThis, ActivePhysics *apOther){ doStateChange(&StateID_Die); }
+	void daShyGuy::_vf108(ActivePhysics *apThis, ActivePhysics *apOther){ doStateChange(&StateID_Die); }
+	void daShyGuy::_vf110(ActivePhysics *apThis, ActivePhysics *apOther){ doStateChange(&StateID_Die); }
+	void daShyGuy::collisionCat8_FencePunch(ActivePhysics *apThis, ActivePhysics *apOther){ doStateChange(&StateID_Die); }
+	void daShyGuy::_vf120(ActivePhysics *apThis, ActivePhysics *apOther){ doStateChange(&StateID_Die); }
+	void daShyGuy::collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther){ doStateChange(&StateID_Die); }
 
-	void daShyGuy::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) {
-		doStateChange(&StateID_Die);
-	}
+	void daShyGuy::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther){ doStateChange(&StateID_DieSmoke); }
 
 	void daShyGuy::collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther){
 		dEn_c::collisionCat3_StarPower(apThis, apOther);
 		doStateChange(&StateID_Die);
 	}
 
-	void daShyGuy::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther){
-		doStateChange(&StateID_Die);
-	}
-
-	void daShyGuy::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther){
-		doStateChange(&StateID_DieSmoke);
-	}
-
 	void daShyGuy::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) {
 		this->damage += 1;
 
-- 
cgit v1.2.3