diff options
author | Colin Noga <Tempus@chronometry.ca> | 2013-05-30 16:06:34 -0500 |
---|---|---|
committer | Colin Noga <Tempus@chronometry.ca> | 2013-05-30 16:06:34 -0500 |
commit | 8d41849c5ee92913cc49f14c4f82f6e39b5467db (patch) | |
tree | 8a11f1081bc5ff14863c28a2e99f398b468c15ad /src/fakeStarCoin.cpp | |
parent | b5fe1a524fef4f4307e06757597ff3fe0317cac3 (diff) | |
download | kamek-8d41849c5ee92913cc49f14c4f82f6e39b5467db.tar.gz kamek-8d41849c5ee92913cc49f14c4f82f6e39b5467db.zip |
Minor fixes
Diffstat (limited to 'src/fakeStarCoin.cpp')
-rw-r--r-- | src/fakeStarCoin.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/fakeStarCoin.cpp b/src/fakeStarCoin.cpp index ae7ac8b..fe65652 100644 --- a/src/fakeStarCoin.cpp +++ b/src/fakeStarCoin.cpp @@ -66,9 +66,22 @@ bool daFakeStarCoin::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhy } bool daFakeStarCoin::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { + SpawnEffect("Wm_en_explosion", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0}); + SpawnEffect("Wm_en_explosion_smk", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){3.0, 3.0, 3.0}); + + PlaySound(this, SE_OBJ_EMY_FIRE_DISAPP); + this->Delete(1); + return true; } bool daFakeStarCoin::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { + SpawnEffect("Wm_ob_cmnicekira", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.5, 1.5, 1.5}); + SpawnEffect("Wm_ob_icebreakwt", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0}); + SpawnEffect("Wm_ob_iceattack", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.5, 1.5, 1.5}); + + PlaySound(this, SE_OBJ_PNGN_ICE_BREAK); + + this->Delete(1); return true; } bool daFakeStarCoin::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { @@ -82,10 +95,10 @@ bool daFakeStarCoin::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePh return true; } bool daFakeStarCoin::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) { - return true; + return collisionCat9_RollingObject(apThis, apOther); } bool daFakeStarCoin::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther) { - return true; + return collisionCat1_Fireball_E_Explosion(apThis, apOther); } bool daFakeStarCoin::collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther) { |