diff options
Diffstat (limited to '')
| -rw-r--r-- | src/shyguyGiants.cpp | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/src/shyguyGiants.cpp b/src/shyguyGiants.cpp index b9415aa..dc474f6 100644 --- a/src/shyguyGiants.cpp +++ b/src/shyguyGiants.cpp @@ -139,37 +139,26 @@ daShyGuyGiant *daShyGuyGiant::build() { dStageActor_c *player = apOther->owner; - if (Player_VF3D4(player)) { - // WE'VE GOT A STAR, FOLKS - if (apThis->_18 == 1 && !player->collMgr.isOnTopOfTile() && player->pos.y > apThis->bottom()) { - bouncePlayer(player, 3.0f); - PlaySound(this, SE_EMY_CMN_STEP); - } else { - dAcPy_vf3F8(player, this, 3); - } - this->counter_504[apOther->owner->which_player] = 0xA; - - return; - } - char hitType; hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 0); - if (hitType == 1) { // regular jump + if (hitType > 0) { PlaySound(this, SE_EMY_CMN_STEP); this->counter_504[apOther->owner->which_player] = 0xA; - } - else if(hitType == 3){ - PlaySound(this, SE_EMY_CMN_STEP); - this->counter_504[apOther->owner->which_player] = 0xA; - } - else if(hitType == 0) { + } else { this->dEn_c::playerCollision(apThis, apOther); this->_vf220(apOther->owner); + if (Player_VF3D4(player)) { + // WE'VE GOT A STAR, FOLKS + if (apThis->_18 == 1 && !player->collMgr.isOnTopOfTile() && player->pos.y > apThis->bottom()) { + bouncePlayer(player, 3.0f); + PlaySound(this, SE_EMY_CMN_STEP); + } else { + dAcPy_vf3F8(player, this, 3); + } + this->counter_504[apOther->owner->which_player] = 0xA; + + } } - else { - OSReport("Some other hit type"); - } - return; } void daShyGuyGiant::bouncePlayerWhenJumpedOn(void *player) { |