mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-27 08:08:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

rebase fixes

Browse Source
This commit is contained in:
lepelog
2026-02-01 18:49:27 +01:00
parent bbccc82fd7
commit 3c3585efeb
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_player_act.h
+1 -1
View File
@@ -642,7 +642,7 @@ public:
return mAttackDirection == ATTACK_JUMP_SLASH;
}
s32 getSpecificAttackDirection() const {
u16 getSpecificAttackDirection() const {
return mSpecificAttackDirection;
}
src/d/tg/d_t_mass_object.cpp
+5 -3
View File
@@ -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) {