Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2025-01-19 12:32:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

forgot Mar::Obj::isAttackable

Browse Source
This commit is contained in:
PishPish 2024-11-11 00:33:24 -05:00
parent 35b2b3572a
commit 59f9c074b5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugProjectNishimuraU/Mar.cpp
View File

@ -650,9 +650,9 @@ Creature* Obj::isAttackable()
const f32 faceDir = getFaceDir();
Parms* parms = C_PARMS;
Vector3f vec
= Vector3f(parms->mGeneral.mMaxAttackRange.mValue * sinf(faceDir), 0.0f, parms->mGeneral.mMaxAttackRange.mValue * cosf(faceDir));
= Vector3f(parms->mGeneral.mMaxAttackRange() * sinf(faceDir), 0.0f, parms->mGeneral.mMaxAttackRange() * cosf(faceDir));
vec += getPosition();
f32 radius = SQUARE(C_GENERALPARMS.mMaxAttackAngle.mValue);
f32 radius = SQUARE(C_GENERALPARMS.mMaxAttackAngle());
Iterator<Piki> iter(pikiMgr);
CI_LOOP(iter)
@ -989,8 +989,8 @@ void Obj::windTarget()
}
f32 radius = mWindScaleTimer * C_GENERALPARMS.mAttackRadius();
Vector3f attackStartPosition = mAttackStartPos; // f16
Vector3f attackDirection = mAttackDirection; // f29
Vector3f attackStartPosition = mAttackStartPos; // f16
Vector3f attackDirection = mAttackDirection; // f29
f32 slope = tan(TORADIANS(C_GENERALPARMS.mAttackHitAngle())); // f20
// this is probably a new vector