From 2e39b2f0ce099aa167c8a188d88e30af4bfc19f3 Mon Sep 17 00:00:00 2001
From: Colin Noga <Tempus@chronometry.ca>
Date: Sat, 25 May 2013 00:03:33 -0500
Subject: A large number of fixes - ramboo, samurai, shy guy, topman, MrSun,
 classic controller

---
 src/mrsun.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/mrsun.cpp')

diff --git a/src/mrsun.cpp b/src/mrsun.cpp
index 1cdfdc9..fa9c96a 100755
--- a/src/mrsun.cpp
+++ b/src/mrsun.cpp
@@ -53,6 +53,7 @@ class daMrSun_c : public dEn_c {
 	void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther);
+	bool collisionCat5_Mario(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther);
@@ -110,7 +111,7 @@ bool daMrSun_c::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics
 	return true;
 }
 bool daMrSun_c::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) { 
-	this->timer = 0; 
+	this->timer = 0;
 	PlaySound(this, SE_EMY_DOWN);
 	doStateChange(&StateID_DieFall);
 	return true;
@@ -137,6 +138,10 @@ bool daMrSun_c::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics
 	DamagePlayer(this, apThis, apOther);
 	return true;
 }
+bool daMrSun_c::collisionCat5_Mario(ActivePhysics *apThis, ActivePhysics *apOther) {
+	DamagePlayer(this, apThis, apOther);
+	return true;
+}
 
 
 void daMrSun_c::dieFall_Execute() {
@@ -261,7 +266,7 @@ int daMrSun_c::onCreate() {
 	
 	doStateChange(&StateID_Follow);
 
-	this->onExecute();
+	// this->onExecute();
 	return true;
 }
 
-- 
cgit v1.2.3