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

getDistanceAndAngleToActor match with weird inline

Browse Source
This commit is contained in:
elijah-thomas774
2024-05-26 05:06:11 -04:00
parent 8ebf6d024b
commit 5029ef8dcf
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_base.cpp
+9 -4
View File
@@ -351,22 +351,27 @@ bool dAcBase_c::getDistanceToActor(dAcBase_c *actor, f32 distThresh, f32 *outDis
return isWithinThreshhold;
}
s32 doAbs(s16 val) {
return labs(val);
}
// Similar weirdness as the above function. Also, r29->31 are initted in the wrong order?
// 8002d290
bool dAcBase_c::getDistanceAndAngleToActor(dAcBase_c *actor, f32 distThresh, s16 yAngle, s16 xAngle, f32 *outDist,
s16 *outDiffAngleY, s16 *outDiffAngleX) {
f32 distSquared = 3.402823e+38f;
s16 angleToActorY = 0;
s16 angleToActorX = 0;
s16 angleToActorY, angleToActorX;
bool isWithinRange = false;
angleToActorY = 0;
angleToActorX = 0;
if (actor != nullptr) {
distSquared = PSVECSquareDistance(position, actor->position);
angleToActorY = targetAngleY(&position, &actor->position);
angleToActorX = targetAngleX(&position, &actor->position);
if ((distSquared <= distThresh * distThresh) && (labs(rotation.y - angleToActorY) <= yAngle) &&
(labs(rotation.x - angleToActorX) <= xAngle)) {
if ((distSquared <= distThresh * distThresh) && (doAbs(s32(rotation.y - angleToActorY)) <= yAngle) &&
(doAbs(s32(rotation.x - angleToActorX)) <= xAngle)) {
isWithinRange = true;
}
}