diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-03-21 13:12:22 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-03-21 13:12:22 -0500 |
| commit | 0dc4aae6128eb16acef1b6faeabcb546762ebe36 (patch) | |
| tree | 6754bbf4c92ffc315d4978b95519492484c62963 /src/challengeStar.cpp | |
| parent | 800f3920d31c2562cc2f0af112c9efa5d5343d6e (diff) | |
| download | kamek-0dc4aae6128eb16acef1b6faeabcb546762ebe36.tar.gz kamek-0dc4aae6128eb16acef1b6faeabcb546762ebe36.zip | |
more fixes
Diffstat (limited to '')
| -rw-r--r-- | src/challengeStar.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/challengeStar.cpp b/src/challengeStar.cpp index 97c4364..ae73851 100644 --- a/src/challengeStar.cpp +++ b/src/challengeStar.cpp @@ -35,6 +35,9 @@ class dChallengeStar : public dEn_c { void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther); void yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther); + void collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther); + void collisionCat7_WMWaggleWaterYoshi(ActivePhysics *apThis, ActivePhysics *apOther); + void collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther); }; @@ -57,6 +60,9 @@ void dChallengeStar::playerCollision(ActivePhysics *apThis, ActivePhysics *apOth void dChallengeStar::yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther) { this->playerCollision(apThis, apOther); } void dChallengeStar::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { this->playerCollision(apThis, apOther); } +void dChallengeStar::collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther) { this->playerCollision(apThis, apOther); } +void dChallengeStar::collisionCat7_WMWaggleWaterYoshi(ActivePhysics *apThis, ActivePhysics *apOther) { this->playerCollision(apThis, apOther); } +void dChallengeStar::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther) { this->playerCollision(apThis, apOther); } dChallengeStar *dChallengeStar::build() { @@ -83,7 +89,7 @@ int dChallengeStar::onCreate() { HitMeBaby.category1 = 0x5; HitMeBaby.category2 = 0x0; HitMeBaby.bitfield1 = 0x4F; - HitMeBaby.bitfield2 = 0xFFFFFFFF; + HitMeBaby.bitfield2 = 0x200; HitMeBaby.unkShort1C = 0; HitMeBaby.callback = &dEn_c::collisionCallback; |