summaryrefslogtreecommitdiff
path: root/src/shyguy.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/shyguy.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/shyguy.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/shyguy.cpp b/src/shyguy.cpp
index 73aaa44..ef807f0 100644
--- a/src/shyguy.cpp
+++ b/src/shyguy.cpp
@@ -251,11 +251,7 @@ daShyGuy *daShyGuy::build() {
// fix multiple player collisions via megazig
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 daShyGuy::yoshiCollision(ActivePhysics *apThis, ActivePhysics *apOther) {