mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-10 05:46:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use naming 'sqdist' for variables where distance in squared

Browse Source
This commit is contained in:
Alexandre-Xavier Labonté-Lamoureux
2022-11-10 19:18:51 -05:00
parent 1e24f14104
commit 26b61b1914
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/nbomb.c
+2 -2
View File
@@ -369,9 +369,9 @@ void nbombInflictDamage(struct nbomb *nbomb)
f32 ydiff = prop->pos.f[1] - nbomb->pos.f[1];
f32 zdiff = prop->pos.f[2] - nbomb->pos.f[2];
f32 dist = xdiff * xdiff + ydiff * ydiff + zdiff * zdiff;
f32 sqdist = xdiff * xdiff + ydiff * ydiff + zdiff * zdiff;
if (dist < nbomb->radius * nbomb->radius) {
if (sqdist < nbomb->radius * nbomb->radius) {
struct chrdata *chr = prop->chr;
if (chr) {
src/game/prop.c
+2 -2
View File
@@ -2582,9 +2582,9 @@ void autoaimTick(void)
f32 xdist = g_Vars.currentplayer->bond2.unk10.x - bestprop->pos.x;
f32 ydist = g_Vars.currentplayer->bond2.unk10.y - bestprop->pos.y;
f32 zdist = g_Vars.currentplayer->bond2.unk10.z - bestprop->pos.z;
f32 dist = xdist * xdist + ydist * ydist + zdist * zdist;
f32 sqdist = xdist * xdist + ydist * ydist + zdist * zdist;
if (dist < 40000) {
if (sqdist < 40000) {
g_Vars.currentplayer->gunctrl.gangsta = true;
} else {
g_Vars.currentplayer->gunctrl.gangsta = false;
src/game/propobj.c
+4 -4
View File
@@ -3153,17 +3153,17 @@ s32 func0f06cd00(struct defaultobj *obj, struct coord *pos, struct coord *arg2,
if (cdresult != CDRESULT_NOCOLLISION) {
struct coord dist;
f32 distance;
f32 sqdist;
f32 mult;
dist.x = pos->x - prop->pos.x;
dist.y = pos->y - prop->pos.y;
dist.z = pos->z - prop->pos.z;
distance = dist.f[0] * dist.f[0] + dist.f[1] * dist.f[1] + dist.f[2] * dist.f[2];
sqdist = dist.f[0] * dist.f[0] + dist.f[1] * dist.f[1] + dist.f[2] * dist.f[2];
if (distance > 0.01f) {
mult = 0.1f / sqrtf(distance);
if (sqdist > 0.01f) {
mult = 0.1f / sqrtf(sqdist);
} else {
mult = 0.5f;
}