summaryrefslogtreecommitdiff
path: root/src/topman.cpp
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-03-13 23:17:46 -0500
committerColin Noga <Tempus@chronometry.ca>2012-03-13 23:17:46 -0500
commit90024c1ccea34513a80ec07749d12ff56c613ac0 (patch)
treea3b92783e56ba86a389f4c2d249c6f6461244f1f /src/topman.cpp
parent3d6a66b86fe5ba0b57f194fa8f80737e95aa6f42 (diff)
downloadkamek-90024c1ccea34513a80ec07749d12ff56c613ac0.tar.gz
kamek-90024c1ccea34513a80ec07749d12ff56c613ac0.zip
fixed up collisions, added a bunch of boss improvements
Diffstat (limited to '')
-rw-r--r--src/topman.cpp8
1 files changed, 2 insertions, 6 deletions
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) {