mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

changed the 'quotient==2' tests to 'geometry == gFieldQuotient'

This commit is contained in:
Zeno Rogue 2018-06-25 23:14:46 +02:00
parent 495d87ff91
commit 030377583c
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigstuff.cpp
View File

@ -121,7 +121,7 @@ void generateAlts(heptagon *h, int levs, bool link_cdata) {
break; break;
} }
} }
if(relspin == -4 && quotient != 2) { if(relspin == -4 && geometry != gFieldQuotient) {
if(h->alt != h->alt->alt) { if(h->alt != h->alt->alt) {
printf("relspin {%p:%p}\n", h->alt, h->alt->alt); printf("relspin {%p:%p}\n", h->alt, h->alt->alt);
{for(int i=0; i<S7; i++) printf("%p ", h->alt->move[i]);} printf(" ALT\n"); {for(int i=0; i<S7; i++) printf("%p ", h->alt->move[i]);} printf(" ALT\n");

2
cell.cpp
View File

@ -1469,7 +1469,7 @@ int celldistance(cell *c1, cell *c2) {
return torusmap()->dists[torusconfig::vec_to_id(decodeId(c1->master)-decodeId(c2->master))]; return torusmap()->dists[torusconfig::vec_to_id(decodeId(c1->master)-decodeId(c2->master))];
} }
if(quotient == 2 && !gp::on) if(geometry == gFieldQuotient && !gp::on)
return currfp.getdist(fieldpattern::fieldval(c1), fieldpattern::fieldval(c2)); return currfp.getdist(fieldpattern::fieldval(c1), fieldpattern::fieldval(c2));
if(sphere || quotient || torus) { if(sphere || quotient || torus) {

2
complex.cpp
View File

@ -2706,7 +2706,7 @@ namespace prairie {
c->LHU.fi.rval = max(celldist(c), 15); c->LHU.fi.rval = max(celldist(c), 15);
} }
else { else {
if(quotient == 2 || !from) { if(geometry == gFieldQuotient || !from) {
c->fval = currfp.distflower0; c->fval = currfp.distflower0;
} }
else if(from && from->land == laPrairie && from->fval) else if(from && from->land == laPrairie && from->fval)

2
fieldpattern.cpp
View File

@ -703,7 +703,7 @@ fpattern current_quotient_field(0), fp_invalid(0);
bool quotient_field_changed; bool quotient_field_changed;
fpattern& getcurrfp() { fpattern& getcurrfp() {
if(quotient == 2 && quotient_field_changed) if(geometry == gFieldQuotient && quotient_field_changed)
return current_quotient_field; return current_quotient_field;
if(S7 == 8 && S3 == 3) { if(S7 == 8 && S3 == 3) {
static fpattern fp(17); static fpattern fp(17);

5
geom-exp.cpp
View File

@ -376,7 +376,7 @@ void showEuclideanMenu() {
dialog::addBoolItem(XLAT("stereographic/orthogonal"), vid.alpha>10, '1'); dialog::addBoolItem(XLAT("stereographic/orthogonal"), vid.alpha>10, '1');
else else
dialog::addBoolItem(XLAT("Poincaré/Klein"), vid.alpha>.5, '1'); dialog::addBoolItem(XLAT("Poincaré/Klein"), vid.alpha>.5, '1');
if(torus || quotient == 2) if(torus || geometry == gFieldQuotient)
dialog::addItem(XLAT("advanced parameters"), '4'); dialog::addItem(XLAT("advanced parameters"), '4');
dialog::addHelp(); dialog::addHelp();
dialog::addBack(); dialog::addBack();
@ -423,7 +423,8 @@ void showEuclideanMenu() {
torusconfig::newmode = torusconfig::torus_mode, torusconfig::newmode = torusconfig::torus_mode,
torus_bitrunc = nonbitrunc, torus_bitrunc = nonbitrunc,
pushScreen(showTorusConfig); pushScreen(showTorusConfig);
if(quotient==2) pushScreen(showQuotientConfig); if(geometry == gFieldQuotient)
pushScreen(showQuotientConfig);
} }
else if(doexiton(sym, uni)) else if(doexiton(sym, uni))
popScreen(); popScreen();