simple updates to challenge collectible and the clown car

1 files changed, 2 insertions, 5 deletions

diff --git a/src/bossCaptainBowser.cpp b/src/bossCaptainBowser.cpp
index 729c1cf..ba78977 100644
--- a/src/bossCaptainBowser.cpp
+++ b/src/bossCaptainBowser.cpp
@@ -86,7 +86,7 @@ daCaptainBowser *daCaptainBowser::build() {
 }
 
 void ShipPhysicsCallback(daCaptainBowser *self, dStageActor_c *other) {
-	if (other->name == EN_CANNON_BULLET) {
+	if (other->name == 657) {
 		OSReport("CANNON COLLISION");
 		if (self->isInvulnerable) {
 			return;
@@ -122,7 +122,7 @@ void ShipPhysicsCallback(daCaptainBowser *self, dStageActor_c *other) {
 	void daCaptainBowser::addScoreWhenHit(void *other) { };
 
 	void daCaptainBowser::spriteCollision(ActivePhysics *apThis, ActivePhysics *apOther) {
-		if (apOther->owner->name == EN_CANNON_BULLET) { //time to get hurt
+		if (apOther->owner->name == 657) { //time to get hurt
 			if (this->isInvulnerable) {
 				return;
 			}
@@ -319,9 +319,6 @@ int daCaptainBowser::onDraw() {
 		if (num == 0) {
 			doStateChange(&StateID_Fire); 		
 		}
-		else if (num == 1) {
-			doStateChange(&StateID_Roar); 		
-		}
 		else{
 			doStateChange(&StateID_Throw); 		
 		}