diff options
author | Colin Noga <Tempus@chronometry.ca> | 2013-05-22 14:18:34 -0500 |
---|---|---|
committer | Colin Noga <Tempus@chronometry.ca> | 2013-05-22 14:18:34 -0500 |
commit | d3b2d9fd92ede02ae06232c92e830e5819104f6e (patch) | |
tree | ed9c055f856a78b4410231464385779228861153 /src/mrsun.cpp | |
parent | 7d7fd4eb64f562978dbc001bffb53482af747a0b (diff) | |
download | kamek-d3b2d9fd92ede02ae06232c92e830e5819104f6e.tar.gz kamek-d3b2d9fd92ede02ae06232c92e830e5819104f6e.zip |
Minor shy guy fixes, topman noise fixes, samurshai wall fixes, removed animtile EFB copy speedup - untested commit
Diffstat (limited to 'src/mrsun.cpp')
-rwxr-xr-x | src/mrsun.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mrsun.cpp b/src/mrsun.cpp index 8f8b811..1cdfdc9 100755 --- a/src/mrsun.cpp +++ b/src/mrsun.cpp @@ -54,6 +54,7 @@ class daMrSun_c : public dEn_c { bool collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther); bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther); bool collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther); + bool collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther); bool collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther); bool collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther); bool collisionCatD_Drill(ActivePhysics *apThis, ActivePhysics *apOther); @@ -132,7 +133,10 @@ bool daMrSun_c::collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhys DamagePlayer(this, apThis, apOther); return true; } - +bool daMrSun_c::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther) { + DamagePlayer(this, apThis, apOther); + return true; +} void daMrSun_c::dieFall_Execute() { |