From d580364e7354d2c8c19d66d08515c905aac9581e Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Sun, 13 Jan 2013 20:05:10 +0100
Subject: fixed star guy jumping

---
 src/shyguyGiants.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/shyguyGiants.cpp b/src/shyguyGiants.cpp
index 133610e..c4d7a77 100644
--- a/src/shyguyGiants.cpp
+++ b/src/shyguyGiants.cpp
@@ -183,7 +183,14 @@ daShyGuyGiant *daShyGuyGiant::build() {
 	void daShyGuyGiant::collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther){  }
 	void daShyGuyGiant::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) {  }
 	void daShyGuyGiant::collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther){
-		dAcPy_vf3F8(apOther->owner, this, 3);
+		int hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 0);
+		if (hitType == 1 || hitType == 3) {
+			PlaySound(this, SE_EMY_CMN_STEP);
+			bouncePlayerWhenJumpedOn(apOther->owner);
+		} else {
+			dAcPy_vf3F8(apOther->owner, this, 3);
+		}
+
 		this->counter_504[apOther->owner->which_player] = 0xA;
 	}
 
-- 
cgit v1.2.3