summaryrefslogtreecommitdiff
path: root/src/bossCaptainBowser.cpp
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-03-22 18:43:21 -0500
committerColin Noga <Tempus@chronometry.ca>2012-03-22 18:43:21 -0500
commit0ae957fcb9d1cb69602bf937c5111a184c3fbc79 (patch)
treeecac5435b445fd3ce7fa8f45b90920a85eb9ae95 /src/bossCaptainBowser.cpp
parentc6becbea298ed12b34f8ad6365e1db0a2870e3e7 (diff)
downloadkamek-0ae957fcb9d1cb69602bf937c5111a184c3fbc79.tar.gz
kamek-0ae957fcb9d1cb69602bf937c5111a184c3fbc79.zip
simple updates to challenge collectible and the clown car
Diffstat (limited to '')
-rw-r--r--src/bossCaptainBowser.cpp7
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);
}