diff options
| author | Treeki <treeki@gmail.com> | 2012-12-04 01:40:59 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-12-04 01:40:59 +0100 |
| commit | e8ffbf5bdc704c4efb426f4d1c10b21527debdc3 (patch) | |
| tree | cd84e5e0c99d69984148be63181e35f954390f23 /src/bossFuzzyBear.cpp | |
| parent | 49fe08ecf61e59fe13bef6a50fffd119e8909e64 (diff) | |
| download | kamek-e8ffbf5bdc704c4efb426f4d1c10b21527debdc3.tar.gz kamek-e8ffbf5bdc704c4efb426f4d1c10b21527debdc3.zip | |
changed WMwagglewater to groundpound
Diffstat (limited to 'src/bossFuzzyBear.cpp')
| -rw-r--r-- | src/bossFuzzyBear.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bossFuzzyBear.cpp b/src/bossFuzzyBear.cpp index 2a96b0b..07dd483 100644 --- a/src/bossFuzzyBear.cpp +++ b/src/bossFuzzyBear.cpp @@ -45,8 +45,8 @@ class daFuzzyBear_c : public daBoss { void collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther); bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther); - void collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther); - void collisionCat7_WMWaggleWaterYoshi(ActivePhysics *apThis, ActivePhysics *apOther); + void collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther); + void collisionCat7_GroundPoundYoshi(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); @@ -93,7 +93,7 @@ void daFuzzyBear_c::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, Ac this->damage++; if (this->damage > 14) { doStateChange(&StateID_Outro); } } -void daFuzzyBear_c::collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther) { +void daFuzzyBear_c::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { apOther->someFlagByte |= 2; dActor_c *block = apOther->owner; @@ -108,7 +108,7 @@ void daFuzzyBear_c::collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhy mario->doSpriteMovement(); mario->doSpriteMovement(); } -void daFuzzyBear_c::collisionCat7_WMWaggleWaterYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { +void daFuzzyBear_c::collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { this->counter_504[apOther->owner->which_player] = 0; this->collisionCat9_RollingObject(apThis, apOther); } |