1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-03-10 07:09:43 +00:00

removed assignment of gp::loc to tie as Clang does not like it

This commit is contained in:
Zeno Rogue
2019-11-30 18:47:43 +01:00
parent 56e575369b
commit f46967efb9
6 changed files with 51 additions and 48 deletions

View File

@@ -36,8 +36,8 @@ int gp_threecolor() {
}
int eupattern(cell *c) {
int x, y;
tie(x,y) = euc2_coordinates(c);
auto co = euc2_coordinates(c);
int x = co.first, y = co.second;
if(a4)
return ((x&1) + 2*(y&1)) % 3;
else
@@ -45,8 +45,8 @@ int eupattern(cell *c) {
}
int eupattern4(cell *c) {
int x, y;
tie(x,y) = euc2_coordinates(c);
auto co = euc2_coordinates(c);
int x = co.first, y = co.second;
return (x&1) + ((y&1)) * 2;
}
@@ -108,8 +108,8 @@ unsigned bitmajority(unsigned a, unsigned b, unsigned c) {
}
int eufifty(cell *c) {
int x, y;
tie(x,y) = euc2_coordinates(c);
auto co = euc2_coordinates(c);
int x = co.first, y = co.second;
int ix = x + 99999 + y;
int iy = y + 99999;
if(c->land == laWildWest)
@@ -1542,8 +1542,8 @@ EX namespace patterns {
ep.extra_params["h2"] = getHemisphere(c, 2);
}
if(euclid) {
int x, y;
tie(x,y) = euc2_coordinates(c);
auto co = euc2_coordinates(c);
int x = co.first, y = co.second;
ep.extra_params["ex"] = x;
ep.extra_params["ey"] = y;
if(S7 == 6) ep.extra_params["ez"] = -x-y;