diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-02-27 11:52:36 -0600 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-02-27 11:52:36 -0600 |
| commit | e45c4a7a24a6a58804261d73c14f008bff1b5a68 (patch) | |
| tree | 31e735b607c67b9da54ad428780f9f6a8c5ca14a /src/bossBalboaWrench.cpp | |
| parent | bd84055f01015239ad297fec687565976f592edd (diff) | |
| download | kamek-e45c4a7a24a6a58804261d73c14f008bff1b5a68.tar.gz kamek-e45c4a7a24a6a58804261d73c14f008bff1b5a68.zip | |
Started on boss junk
Diffstat (limited to 'src/bossBalboaWrench.cpp')
| -rw-r--r-- | src/bossBalboaWrench.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/bossBalboaWrench.cpp b/src/bossBalboaWrench.cpp index 1db7496..9760d8a 100644 --- a/src/bossBalboaWrench.cpp +++ b/src/bossBalboaWrench.cpp @@ -48,6 +48,8 @@ class daBalboa_c : public dEn_c { void collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther); + void collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther); + void collisionCat7_WMWaggleWaterYoshi(ActivePhysics *apThis, ActivePhysics *apOther); USING_STATES(daBalboa_c); DECLARE_STATE(Grow); @@ -124,12 +126,7 @@ void daBalboa_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) } } -void daBalboa_c::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { -} - -bool daBalboa_c::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { OSReport("Hit Iceball"); return false; } - -void daBalboa_c::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { +void daBalboa_c::collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther) { this->damage -= 1; apOther->someFlagByte |= 2; @@ -143,7 +140,8 @@ void daBalboa_c::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics } - +void daBalboa_c::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { } +bool daBalboa_c::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { OSReport("Hit Iceball"); return false; } void daBalboa_c::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { } void daBalboa_c::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) { OSReport("Hit Hammer"); } |