diff options
| author | Treeki <treeki@gmail.com> | 2013-01-13 19:47:42 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-01-13 19:47:42 +0100 |
| commit | 66011f3237bab2a465a2c44cbab51822316a661d (patch) | |
| tree | 8f44a95e3c7ee473f77f0f58191937dd91950053 | |
| parent | e2a1dbba1261916104afcbbf91e2eae6e91c771c (diff) | |
| download | kamek-66011f3237bab2a465a2c44cbab51822316a661d.tar.gz kamek-66011f3237bab2a465a2c44cbab51822316a661d.zip | |
tidying up some ugly code a bit
| -rw-r--r-- | src/shyguyGiants.cpp | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/src/shyguyGiants.cpp b/src/shyguyGiants.cpp index 9db7d1d..133610e 100644 --- a/src/shyguyGiants.cpp +++ b/src/shyguyGiants.cpp @@ -159,23 +159,43 @@ daShyGuyGiant *daShyGuyGiant::build() { bouncePlayer(player, 5.0f); } - void daShyGuyGiant::yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther) { this->playerCollision(apThis, apOther); } - void daShyGuyGiant::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { BigHanaWeirdGP(this, apThis, apOther); } - void daShyGuyGiant::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { BigHanaGroundPound(this, apThis, apOther); } - void daShyGuyGiant::collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { BigHanaGroundPound(this, apThis, apOther); } + void daShyGuyGiant::yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther) { + this->playerCollision(apThis, apOther); + } + void daShyGuyGiant::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { + BigHanaWeirdGP(this, apThis, apOther); + } + void daShyGuyGiant::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { + BigHanaGroundPound(this, apThis, apOther); + } + void daShyGuyGiant::collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { + BigHanaGroundPound(this, apThis, apOther); + } void daShyGuyGiant::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { apOther->owner->kill(); } - void daShyGuyGiant::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther){ dAcPy_vf3F8(apOther->owner, this, 3); this->counter_504[apOther->owner->which_player] = 0xA; } + void daShyGuyGiant::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther){ + dAcPy_vf3F8(apOther->owner, this, 3); + this->counter_504[apOther->owner->which_player] = 0xA; + } void daShyGuyGiant::collisionCat5_Mario(ActivePhysics *apThis, ActivePhysics *apOther){ } void daShyGuyGiant::collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther){ } void daShyGuyGiant::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) { } - void daShyGuyGiant::collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther){ dAcPy_vf3F8(apOther->owner, this, 3); this->counter_504[apOther->owner->which_player] = 0xA; } + void daShyGuyGiant::collisionCat3_StarPower(ActivePhysics *apThis, ActivePhysics *apOther){ + dAcPy_vf3F8(apOther->owner, this, 3); + this->counter_504[apOther->owner->which_player] = 0xA; + } - void daShyGuyGiant::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther){ BigHanaFireball(this, apThis, apOther); } - void daShyGuyGiant::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { BigHanaFireball(this, apThis, apOther); } - bool daShyGuyGiant::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { return BigHanaIceball(this, apThis, apOther); } + void daShyGuyGiant::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther){ + BigHanaFireball(this, apThis, apOther); + } + void daShyGuyGiant::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { + BigHanaFireball(this, apThis, apOther); + } + bool daShyGuyGiant::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { + return BigHanaIceball(this, apThis, apOther); + } // These handle the ice crap void daShyGuyGiant::_vf148() { |