From 45d2a2c4bb8fcc3c5f2fc1b21a1626be6f51ddf2 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Tue, 13 Dec 2022 23:27:59 +0100 Subject: [PATCH] fixed to point2 instead of hpxy in mousedist and shmup --- graph.cpp | 2 +- shmup.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/graph.cpp b/graph.cpp index 65e87166..72b75605 100644 --- a/graph.cpp +++ b/graph.cpp @@ -4059,7 +4059,7 @@ EX ld mousedist(shiftmatrix T) { if(mouseaim_sensitivity) return sqhypot_d(2, T1.h) + (point_behind(T1) ? 1e10 : 0); hyperpoint h1; applymodel(T1, h1); - h1 = h1 - hpxy((mousex - current_display->xcenter) / current_display->radius, (mousey - current_display->ycenter) / current_display->radius); + h1 = h1 - point2((mousex - current_display->xcenter) / current_display->radius, (mousey - current_display->ycenter) / current_display->radius); return sqhypot_d(2, h1) + (point_behind(T1) ? 1e10 : 0); } diff --git a/shmup.cpp b/shmup.cpp index d86add22..2347b83e 100644 --- a/shmup.cpp +++ b/shmup.cpp @@ -872,7 +872,7 @@ void movePlayer(monster *m, int delta) { double mdd = hypot(mdx, mdy); if(mdd > 1e-6) { - hyperpoint jh = hpxy(mdx/100.0, mdy/100.0); + hyperpoint jh = point2(mdx/100.0, mdy/100.0); shiftpoint ctr = m->pat * C0; if(sphere && pconf.alpha > 1.001) for(int i=0; i<3; i++) ctr[i] = -ctr[i]; @@ -1040,7 +1040,7 @@ void movePlayer(monster *m, int delta) { if(cwt.at->land == laWestWall) yp = xp * 1, xp *= 0.7; for(cell *c2: below) if(c2 != m->base) { - hyperpoint h = rspintox(inverse_shift(m->pat, tC0(gmatrix[c2]))) * hpxy(xp, yp); + hyperpoint h = rspintox(inverse_shift(m->pat, tC0(gmatrix[c2]))) * point2(xp, yp); m->inertia += h; avg_inertia += h/2;