diff options
| author | Jeff Padgham <jeff.ookami@gmail.com> | 2024-04-26 19:12:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-26 19:12:56 -0700 |
| commit | c163dc9ed31c69eb791be1dcdcd7ab8b296e95a1 (patch) | |
| tree | 569d09bb0c51bde94264b8faeb83cee6b4ae1278 /include/d/cc | |
| parent | 9e80bf0d84c150b07ca14cea53ee6d2f82b073c2 (diff) | |
d_a_arrow work (#2139)
* WIP commit, about halfway done
* More progress, fixed up some issues
* Most functions match, minor issues in draw/create, dtor needs particle work
* Forgot to remove NONMATCHING define
---------
Co-authored-by: GinNoOokami <noreply>
Diffstat (limited to 'include/d/cc')
| -rw-r--r-- | include/d/cc/d_cc_d.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/d/cc/d_cc_d.h b/include/d/cc/d_cc_d.h index 3c7ac0a03d..64ee42a1ef 100644 --- a/include/d/cc/d_cc_d.h +++ b/include/d/cc/d_cc_d.h @@ -236,6 +236,7 @@ public: u8 GetHitMark() { return mHitMark; } void SetRVec(cXyz& vec) { mRVec = vec; } cXyz* GetVecP() { return &mVec; } + cXyz* GetRVecP() { return &mRVec; } void SetHitPos(cXyz& pos) { mHitPos = pos; } cXyz* GetHitPosP() { return &mHitPos; } @@ -362,6 +363,7 @@ public: bool ChkTgWolfSpNoDamage() { return mGObjTg.ChkSPrm(0x800); } bool ChkAtNoHitMark() { return mGObjAt.ChkSPrm(2); } bool ChkTgNoHitMark() { return mGObjTg.ChkSPrm(4); } + bool ChkTgArrowThrough() { return mGObjTg.ChkSPrm(0x20); } bool ChkTgHookShotNoHitMark() { return mGObjTg.ChkSPrm(0x400); } bool ChkTgArrowNoHitMark() { return mGObjTg.ChkSPrm(0x1000); } dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mGObjTg.GetSpl(); } @@ -389,6 +391,7 @@ public: u32 GetTgHitObjHitSeID(int i_soundID) { return getHitSeID(GetTgHitObjSe(),i_soundID); } cXyz* GetAtHitPosP() { return mGObjAt.GetHitPosP(); } cXyz* GetTgHitPosP() { return mGObjTg.GetHitPosP(); } + cXyz* GetTgRVecP() { return mGObjTg.GetRVecP(); } bool ChkTgHookshotThrough() { return mGObjTg.ChkSPrm(0x80); } static const Z2SoundID m_hitSeID[24]; |