diff options
Diffstat (limited to 'src/bossTopman.cpp')
| -rw-r--r-- | src/bossTopman.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/bossTopman.cpp b/src/bossTopman.cpp index ddc37b6..77593a3 100644 --- a/src/bossTopman.cpp +++ b/src/bossTopman.cpp @@ -130,10 +130,13 @@ daDreidel *daDreidel::build() { void daDreidel::spriteCollision(ActivePhysics *apThis, ActivePhysics *apOther) { if (apOther->owner->name == 390) { //time to get hurt + OSReport("YO SUP I'M A TOPMAN AND I'M COLLIDING WITH A FUCKING WALL [%d]\n", damage); if (this->isInvulnerable) { + OSReport("I'm invulnerable so I'm ignoring it\n"); return; } this->damage += 1; + OSReport("I'm increasing my damage to %d\n", damage); doStateChange(&StateID_Damage); if (this->damage == 3) { doStateChange(&StateID_Outro); } @@ -147,15 +150,10 @@ daDreidel *daDreidel::build() { char hitType; hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 0); - if(hitType == 1) { // regular jump + if(hitType > 0) { this->_vf220(apOther->owner); this->counter_504[apOther->owner->which_player] = 0; - } - else if(hitType == 3) { // spinning jump or whatever? - this->_vf220(apOther->owner); - this->counter_504[apOther->owner->which_player] = 0; - } - else if(hitType == 0) { + } else { if (this->charging == 1) { |