diff options
| author | Treeki <treeki@gmail.com> | 2013-01-12 23:42:34 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-01-12 23:42:34 +0100 |
| commit | e2a1dbba1261916104afcbbf91e2eae6e91c771c (patch) | |
| tree | 539f9a96a78275b2ecf3de33da45119d1e6e3218 | |
| parent | 00e7c9836b77dfcde5cfec0c38657d9b564c18bb (diff) | |
| download | kamek-e2a1dbba1261916104afcbbf91e2eae6e91c771c.tar.gz kamek-e2a1dbba1261916104afcbbf91e2eae6e91c771c.zip | |
*facepalms*
| -rw-r--r-- | src/shyguy.cpp | 8 | ||||
| -rw-r--r-- | src/shyguyGiants.cpp | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/shyguy.cpp b/src/shyguy.cpp index cb0753a..67662fa 100644 --- a/src/shyguy.cpp +++ b/src/shyguy.cpp @@ -268,12 +268,16 @@ daShyGuy *daShyGuy::build() { void daShyGuy::collisionCatD_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { PlaySound(this, SE_EMY_DOWN); SpawnEffect("Wm_mr_hardhit", 0, &pos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0}); - this->addScoreWhenHit(this); + //addScoreWhenHit accepts a player parameter. + //DON'T DO THIS: + // this->addScoreWhenHit(this); doStateChange(&StateID_Die); } void daShyGuy::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { this->collisionCatD_GroundPound(apThis, apOther); } void daShyGuy::collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { this->collisionCatD_GroundPound(apThis, apOther); } - void daShyGuy::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { this->collisionCatD_GroundPound(apThis, apOther); } + void daShyGuy::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { + this->collisionCatD_GroundPound(apThis, apOther); + } void daShyGuy::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther){ this->collisionCatD_GroundPound(apThis, apOther); } void daShyGuy::collisionCat5_Mario(ActivePhysics *apThis, ActivePhysics *apOther){ this->collisionCatD_GroundPound(apThis, apOther); } void daShyGuy::collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther){ this->collisionCatD_GroundPound(apThis, apOther); } diff --git a/src/shyguyGiants.cpp b/src/shyguyGiants.cpp index e6789d8..9db7d1d 100644 --- a/src/shyguyGiants.cpp +++ b/src/shyguyGiants.cpp @@ -164,7 +164,9 @@ daShyGuyGiant *daShyGuyGiant::build() { 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::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::collisionCat5_Mario(ActivePhysics *apThis, ActivePhysics *apOther){ } void daShyGuyGiant::collisionCat11_PipeCannon(ActivePhysics *apThis, ActivePhysics *apOther){ } |