From 42ca4c9312543cf6333526a0047a4e4cad5a5cc5 Mon Sep 17 00:00:00 2001
From: Colin Noga <Tempus@chronometry.ca>
Date: Tue, 7 May 2013 16:23:03 -0500
Subject: rc3 shy guy and shy guy bos fixes

---
 src/bossSamurshai.cpp |  3 +++
 src/shyguy.cpp        | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp
index fbf079b..59e8036 100644
--- a/src/bossSamurshai.cpp
+++ b/src/bossSamurshai.cpp
@@ -872,6 +872,7 @@ void daSamurshai::updateModelMatrices() {
 
 		Chuckles.removeFromList();
 		Knuckles.removeFromList();
+		aPhysics.removeFromList();
 
 		SpawnEffect("Wm_ob_switch", 0, &(Vec){pos.x, pos.y + 16.0, pos.z}, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
 		MapSoundPlayer(SoundRelatedClass, SE_BOSS_CMN_DAMAGE_DEF, 1);
@@ -892,6 +893,8 @@ void daSamurshai::updateModelMatrices() {
 		}
 	}
 	void daSamurshai::endState_Damage() {
+		aPhysics.addToList();
+
 		this->isDown = 0;		
 		this->rot.y = (direction) ? 0xD800 : 0x2800;
 	}
diff --git a/src/shyguy.cpp b/src/shyguy.cpp
index 5a5dc8d..8f6d6f3 100644
--- a/src/shyguy.cpp
+++ b/src/shyguy.cpp
@@ -230,7 +230,7 @@ daShyGuy *daShyGuy::build() {
 		if (this->isDown == 0) { 
 			hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 2);
 		}
-		else { // Shy Guy is in throwy mode
+		else { // Shy Guy is in downed mode
 			hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 0);
 		}
 
@@ -238,10 +238,13 @@ daShyGuy *daShyGuy::build() {
 			apOther->someFlagByte |= 2;
 			if (this->isDown == 0) { 
 				this->playEnemyDownSound1();
-				doStateChange(stateVar);
+				if (damage >= 1) {
+					doStateChange(deathState); }
+				else {
+					doStateChange(stateVar); }
 				damage++;
 			}
-			else { // Shy Guy is in throwy mode - kill it with fire
+			else { // Shy Guy is in downed mode - kill it with fire
 				this->playEnemyDownSound1();
 				doStateChange(deathState);
 			}				
@@ -250,10 +253,13 @@ daShyGuy *daShyGuy::build() {
 			apOther->someFlagByte |= 2;
 			if (this->isDown == 0) { 
 				this->playEnemyDownSound1();
-				doStateChange(stateVar);
+				if (damage >= 1) {
+					doStateChange(deathState); }
+				else {
+					doStateChange(stateVar); }
 				damage++;
 			}
-			else { // Shy Guy is in throwy mode - kill it with fire
+			else { // Shy Guy is in downed mode - kill it with fire
 				this->playEnemyDownSound1();
 				doStateChange(deathState);
 			}				
-- 
cgit v1.2.3