1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-03 12:49:17 +00:00

silenced warnings by replacing \& with \&\&

This commit is contained in:
Zeno Rogue 2023-04-12 01:56:09 +02:00
parent 5b47779028
commit 3ded56524d

View File

@ -191,7 +191,7 @@ bool flag_clamp_max(ld& coord, ld maxv) {
} }
bool flag_clamp(ld& coord, ld minv, ld maxv) { bool flag_clamp(ld& coord, ld minv, ld maxv) {
return flag_clamp_min(coord, minv) & flag_clamp_max(coord, maxv); return flag_clamp_min(coord, minv) && flag_clamp_max(coord, maxv);
} }
bool flag_clamp_sym(ld& coord, ld v) { bool flag_clamp_sym(ld& coord, ld v) {
@ -209,13 +209,13 @@ bool inbound(ld& x, ld& y) {
return flag_clamp(x, 90._deg, M_PI); return flag_clamp(x, 90._deg, M_PI);
case dsTractricoid: case dsTractricoid:
return flag_clamp_min(x, 0) & flag_clamp_sym(y, M_PI); return flag_clamp_min(x, 0) && flag_clamp_sym(y, M_PI);
case dsKuen: case dsKuen:
return flag_clamp(x, 0, M_PI) & flag_clamp(y, 0, TAU); return flag_clamp(x, 0, M_PI) && flag_clamp(y, 0, TAU);
case dsHyperlike: case dsHyperlike:
return flag_clamp_sym(x, M_PI) & flag_clamp_sym(y, hyperlike_bound()); return flag_clamp_sym(x, M_PI) && flag_clamp_sym(y, hyperlike_bound());
default: default:
return true; return true;