From 90024c1ccea34513a80ec07749d12ff56c613ac0 Mon Sep 17 00:00:00 2001 From: Colin Noga Date: Tue, 13 Mar 2012 23:17:46 -0500 Subject: fixed up collisions, added a bunch of boss improvements --- src/topman.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/topman.cpp') diff --git a/src/topman.cpp b/src/topman.cpp index c9a679d..2f9ae4d 100644 --- a/src/topman.cpp +++ b/src/topman.cpp @@ -127,9 +127,7 @@ daTopman *daTopman::build() { // 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; - } + this->counter_504[apOther->owner->which_player] = 0; } void daTopman::yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther) { @@ -142,9 +140,7 @@ daTopman *daTopman::build() { this->isDead = 0; this->flags_4FC |= (1<<(31-7)); - if(apOther->owner->which_player < 4) { - this->counter_504[apOther->owner->which_player] = 0; - } + this->counter_504[apOther->owner->which_player] = 0; } void daTopman::collisionCat7_WMWaggleWater(ActivePhysics *apThis, ActivePhysics *apOther) { -- cgit v1.2.3