diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-03-08 15:38:03 -0600 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-03-08 15:38:03 -0600 |
| commit | e1e747c5d256570a3d8caf459e24274397de7235 (patch) | |
| tree | 1658ec435748c6575d5e219184d5eeb87e329b22 /src/bossThwompaDomp.cpp | |
| parent | 19632e9b183402bb9a05030e12d0f1003765c31a (diff) | |
| download | kamek-e1e747c5d256570a3d8caf459e24274397de7235.tar.gz kamek-e1e747c5d256570a3d8caf459e24274397de7235.zip | |
Electric line, topman boss, and BROKEN YOSHIS
Diffstat (limited to '')
| -rw-r--r-- | src/bossThwompaDomp.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/bossThwompaDomp.cpp b/src/bossThwompaDomp.cpp index fb8d59e..89f2c14 100644 --- a/src/bossThwompaDomp.cpp +++ b/src/bossThwompaDomp.cpp @@ -60,6 +60,7 @@ class daEnMegaDosun_c : public dEn_c { void setupBodyModel(); + void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther); bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther); void collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther); @@ -96,6 +97,18 @@ daEnMegaDosun_c *daEnMegaDosun_c::build() { // Collisions + + void daEnMegaDosun_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) { + this->dEn_c::playerCollision(apThis, apOther); + this->_vf220(apOther->owner); + + // fix multiple player collisions via megazig + this->isDead = 0; + this->flags_4FC |= (1<<(31-7)); + if(apOther->owner->which_player < 4) { + this->counter_504[apOther->owner->which_player] = 0; + } + } void daEnMegaDosun_c::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { } bool daEnMegaDosun_c::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { return false; } void daEnMegaDosun_c::collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther) { } |