diff options
| author | Treeki <treeki@gmail.com> | 2013-02-03 00:31:46 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-02-03 00:31:46 +0100 |
| commit | 06828e3a02a0ca2eaf56d804bb6845659cfa59e7 (patch) | |
| tree | bb28c665445fc622958b9614d014ba791cad2d0f /src/bossBombDrop.cpp | |
| parent | 012efaa6343cd2bec2f728d0bec6243263712a45 (diff) | |
| download | kamek-06828e3a02a0ca2eaf56d804bb6845659cfa59e7.tar.gz kamek-06828e3a02a0ca2eaf56d804bb6845659cfa59e7.zip | |
fix a bug in the collision headers, and assorted collision bugs
Diffstat (limited to '')
| -rw-r--r-- | src/bossBombDrop.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/bossBombDrop.cpp b/src/bossBombDrop.cpp index 7959268..b8e4204 100644 --- a/src/bossBombDrop.cpp +++ b/src/bossBombDrop.cpp @@ -30,12 +30,12 @@ class dDroppedBomb : public dEn_c { void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther); // void spriteCollision(ActivePhysics *apThis, ActivePhysics *apOther); - void collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther); + bool collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther); bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther); - void collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther); - void collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther); - void collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther); - void collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther); + bool collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther); + bool collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther); + bool collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther); + bool collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther); }; void dDroppedBomb::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) { @@ -49,12 +49,12 @@ dDroppedBomb *dDroppedBomb::build() { } // void dDroppedBomb::spriteCollision(ActivePhysics *apThis, ActivePhysics *apOther) { this->kill(); } -void dDroppedBomb::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { } +bool dDroppedBomb::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) {return true;} bool dDroppedBomb::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { return false; } -void dDroppedBomb::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) {} -void dDroppedBomb::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) {} -void dDroppedBomb::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther) {} -void dDroppedBomb::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) {} +bool dDroppedBomb::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) {return true;} +bool dDroppedBomb::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) {return true;} +bool dDroppedBomb::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther) {return true;} +bool dDroppedBomb::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) {return true;} void dDroppedBomb::kill() { PlaySoundAsync(this, SE_BOSS_JR_BOMB_BURST); |