mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

fixed to point2 instead of hpxy in mousedist and shmup

Browse Source
This commit is contained in:
Zeno Rogue 2022-12-13 23:27:59 +01:00
parent 1b8e2623ac
commit 45d2a2c4bb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graph.cpp
View File

@ -4059,7 +4059,7 @@ EX ld mousedist(shiftmatrix T) {
if(mouseaim_sensitivity) return sqhypot_d(2, T1.h) + (point_behind(T1) ? 1e10 : 0); if(mouseaim_sensitivity) return sqhypot_d(2, T1.h) + (point_behind(T1) ? 1e10 : 0);
hyperpoint h1; hyperpoint h1;
applymodel(T1, 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); return sqhypot_d(2, h1) + (point_behind(T1) ? 1e10 : 0);
} }

4
shmup.cpp
View File

@ -872,7 +872,7 @@ void movePlayer(monster *m, int delta) {
double mdd = hypot(mdx, mdy); double mdd = hypot(mdx, mdy);
if(mdd > 1e-6) { 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; shiftpoint ctr = m->pat * C0;
if(sphere && pconf.alpha > 1.001) for(int i=0; i<3; i++) ctr[i] = -ctr[i]; 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; if(cwt.at->land == laWestWall) yp = xp * 1, xp *= 0.7;
for(cell *c2: below) if(c2 != m->base) { 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; m->inertia += h;
avg_inertia += h/2; avg_inertia += h/2;