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/bossSamurshai.cpp | |
| parent | 49fe08ecf61e59fe13bef6a50fffd119e8909e64 (diff) | |
| download | kamek-e8ffbf5bdc704c4efb426f4d1c10b21527debdc3.tar.gz kamek-e8ffbf5bdc704c4efb426f4d1c10b21527debdc3.zip | |
changed WMwagglewater to groundpound
Diffstat (limited to '')
| -rw-r--r-- | src/bossSamurshai.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp index 91056f0..a5b2b30 100644 --- a/src/bossSamurshai.cpp +++ b/src/bossSamurshai.cpp @@ -54,8 +54,8 @@ class daSamurshai : public daBoss { void collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCatD_GroundPound(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 collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther); bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther); @@ -136,7 +136,7 @@ daSamurshai *daSamurshai::build() { void daSamurshai::yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther) { this->playerCollision(apThis, apOther); } void daSamurshai::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { } - void daSamurshai::collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther) { + void daSamurshai::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { apOther->someFlagByte |= 2; if (topHurts == true) { @@ -153,7 +153,7 @@ daSamurshai *daSamurshai::build() { this->flags_4FC |= (1<<(31-7)); this->counter_504[apOther->owner->which_player] = 0; } - void daSamurshai::collisionCat7_WMWaggleWaterYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { this->collisionCat7_WMWaggleWater(apThis, apOther); } + void daSamurshai::collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { this->collisionCat7_GroundPound(apThis, apOther); } void daSamurshai::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { if (this->isDown == 0) { damage += 3; |