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/bossMegaGoomba.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/bossMegaGoomba.cpp') diff --git a/src/bossMegaGoomba.cpp b/src/bossMegaGoomba.cpp index 42ff2d4..2bfc681 100644 --- a/src/bossMegaGoomba.cpp +++ b/src/bossMegaGoomba.cpp @@ -249,11 +249,7 @@ void daMegaGoomba_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOth //FIXME hack to make multiple playerCollisions work this->isDead = 0; this->flags_4FC |= (1<<(31-7)); - if(apOther->owner->which_player > 3) { - OSReport("!!!ATTENTION!!!\napOther->owner->which_player > 3\n"); - }else{ - this->counter_504[apOther->owner->which_player] = 0; - } + this->counter_504[apOther->owner->which_player] = 0; } //void daMegaGoomba_c::yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther) { OSReport("yoshiCollision\n"); } -- cgit v1.2.3