falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTM: Remove sqrtf in range check

This commit is contained in:
Ryan Dwyer 2023-05-13 19:51:02 +10:00
parent b83d5a4279
commit 614579ac7c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/mplayer/scenarios/hackthatmac.inc
View File

@ -440,7 +440,7 @@ static void htmTickChr(struct chrdata *chr)
struct coord *terminalpos = &data->terminals[data->dlterminalnum].prop->pos;
f32 angle;
f32 relangle;
f32 rangexz;
f32 sqrangexz;
f32 rangey;
struct coord *chrpos;
struct coord dist;
@ -460,7 +460,7 @@ static void htmTickChr(struct chrdata *chr)
dist.y = terminalpos->y - chrpos->y;
dist.z = terminalpos->z - chrpos->z;
rangexz = sqrtf(dist.x * dist.x + dist.z * dist.z);
sqrangexz = dist.x * dist.x + dist.z * dist.z;
rangey = absf(dist.y);
@ -480,10 +480,8 @@ static void htmTickChr(struct chrdata *chr)
relangle = -relangle;
}
if (rangexz > 250 || rangey > 200 || relangle > 45 || !holdinguplink) {
if (rangexz < 250 && rangey < 200) {
if (sqrangexz > 250 * 250 || rangey > 200 || relangle > 45 || !holdinguplink) {
if (sqrangexz < 250 * 250 && rangey < 200) {
data->playernuminrange = playernum;
} else {
data->playernuminrange = -1;
@ -518,7 +516,6 @@ static void htmTickChr(struct chrdata *chr)
*time = 0;
}
}
}
}