mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 13:13:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_player - Add cut type enum (#966)

Browse Source 
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
This commit is contained in:
123456789758
2026-05-01 01:12:52 -04:00
committed by GitHub
parent c56b902ed1
commit b46f2904d1
24 changed files with 176 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_shmrgrd.cpp
+2 -2
View File
@@ -388,9 +388,9 @@ void daObjShmrgrd_c::set_damage() {
cCcD_Obj *hitObj = mCylTg.GetTgHitObj();
fopAc_ac_c* hitActor = mCylTg.GetTgHitAc();
if (hitObj->ChkAtType(AT_TYPE_SKULL_HAMMER) && fopAcM_GetProfName(hitActor) == PROC_PLAYER) {
if (check_player_angle(hitActor) && (attackState == 0x12 || attackState == 0x13)) {
if (check_player_angle(hitActor) && (attackState == daPy_py_c::CUT_TYPE_HAMMER_FRONTSWING || attackState == daPy_py_c::CUT_TYPE_JUMPCUT_HAMMER)) {
M_damage = 1;
} else if (attackState == 0x11) {
} else if (attackState == daPy_py_c::CUT_TYPE_HAMMER_SIDESWING) {
M_damage_dir = cM_atan2s(mCylTg.GetTgRVecP()->x, mCylTg.GetTgRVecP()->z);
M_damage = 2;
}