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/mrsun.cpp | |
| parent | 49fe08ecf61e59fe13bef6a50fffd119e8909e64 (diff) | |
| download | kamek-e8ffbf5bdc704c4efb426f4d1c10b21527debdc3.tar.gz kamek-e8ffbf5bdc704c4efb426f4d1c10b21527debdc3.zip | |
changed WMwagglewater to groundpound
Diffstat (limited to 'src/mrsun.cpp')
| -rwxr-xr-x | src/mrsun.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mrsun.cpp b/src/mrsun.cpp index 35d72a4..1ccfdc9 100755 --- a/src/mrsun.cpp +++ b/src/mrsun.cpp @@ -57,8 +57,8 @@ class daMrSun_c : public dEn_c { void collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCat3_StarPower(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); USING_STATES(daMrSun_c); DECLARE_STATE(Follow); @@ -113,8 +113,8 @@ void daMrSun_c::collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *ap PlaySound(this, SE_EMY_DOWN); doStateChange(&StateID_DieFall); } void daMrSun_c::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { DamagePlayer(this, apThis, apOther); } -void daMrSun_c::collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther) { DamagePlayer(this, apThis, apOther); } -void daMrSun_c::collisionCat7_WMWaggleWaterYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { DamagePlayer(this, apThis, apOther); } +void daMrSun_c::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { DamagePlayer(this, apThis, apOther); } +void daMrSun_c::collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { DamagePlayer(this, apThis, apOther); } |