diff options
| author | lepelog <25211966+lepelog@users.noreply.github.com> | 2026-02-01 18:49:27 +0100 |
|---|---|---|
| committer | lepelog <25211966+lepelog@users.noreply.github.com> | 2026-02-01 18:49:27 +0100 |
| commit | 3c3585efeb19390cd83883b8e2d8043bee52c6c0 (patch) | |
| tree | d6da3fadd43efbc67aca6827d8d4a5643d25a8b3 | |
| parent | bbccc82fd768853dd1adcef8a661f7a2c1e5a76e (diff) | |
rebase fixes
| -rw-r--r-- | include/d/d_player_act.h | 2 | ||||
| -rw-r--r-- | src/d/tg/d_t_mass_object.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/d/d_player_act.h b/include/d/d_player_act.h index 4dadb99f..c8deccaa 100644 --- a/include/d/d_player_act.h +++ b/include/d/d_player_act.h @@ -642,7 +642,7 @@ public: return mAttackDirection == ATTACK_JUMP_SLASH; } - s32 getSpecificAttackDirection() const { + u16 getSpecificAttackDirection() const { return mSpecificAttackDirection; } diff --git a/src/d/tg/d_t_mass_object.cpp b/src/d/tg/d_t_mass_object.cpp index 2d590a49..15cc73b2 100644 --- a/src/d/tg/d_t_mass_object.cpp +++ b/src/d/tg/d_t_mass_object.cpp @@ -874,8 +874,9 @@ bool dTgMassObjInstance::checkForHit( } hitPosition = link->mPosition; distance = mGroundHeight.distance(hitPosition); - if (link->getSpecificAttackDirection() == 1 || link->getSpecificAttackDirection() == 0x10 || - link->getSpecificAttackDirection() == 0x100) { + if ((s32)link->getSpecificAttackDirection() == dAcPy_c::ATTACK_DIRECTION_DOWN || + (s32)link->getSpecificAttackDirection() == dAcPy_c::ATTACK_DIRECTION_UP || + (s32)link->getSpecificAttackDirection() == dAcPy_c::ATTACK_DIRECTION_STAB) { if (distance < fVar20) { isNotCut = 0; } else { @@ -892,7 +893,8 @@ bool dTgMassObjInstance::checkForHit( hitPosition = dAcPy_c::GetLink()->getSwordPos(); distance = mGroundHeight.distance(hitPosition); - if (link->getSpecificAttackDirection() != 2 && link->getSpecificAttackDirection() != 0x80) { + if ((s32)link->getSpecificAttackDirection() != dAcPy_c::ATTACK_DIRECTION_DOWNRIGHT && + (s32)link->getSpecificAttackDirection() != dAcPy_c::ATTACK_DIRECTION_DOWNLEFT) { return true; } if (distance >= fVar21) { |