mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-02-04 17:00:15 +00:00
Code Issues Releases Wiki Activity

Merge pull request #60 from Quuxplusone/polarb50

Browse Source 
polara50 and polarb50 now consistently return bool, not int
This commit is contained in:
Zeno Rogue
2018-09-24 00:24:50 +02:00
committed by GitHub
parent 41ecd6c0c1 f84975d1d1
commit 7058ccf747
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pattern2.cpp
View File

@@ -138,19 +138,19 @@ int land50(cell *c) {
}
}
int polara50(cell *c) {
if(sphere || euclid || S7>7 || S6>6) return 0;
bool polara50(cell *c) {
if(sphere || euclid || S7>7 || S6>6) return false;
else if(NONSTDVAR) return polara50(fiftyval(c->master->c7));
else if(ctof(c)) return polara50(fiftyval(c));
else {
auto ar = gp::get_masters(c);
for(int i=0; i<3; i++)
if(cdist50(ar[i]->fiftyval) < 3) return polara50(ar[i]->fiftyval);
return 0;
return false;
}
}
int polarb50(cell *c) {
bool polarb50(cell *c) {
if(euclid) return true;
if(sphere || euclid || S7>7 || S6>6) return true;
else if(NONSTDVAR) return polarb50(fiftyval(c->master->c7));
@@ -159,7 +159,7 @@ int polarb50(cell *c) {
auto ar = gp::get_masters(c);
for(int i=0; i<3; i++)
if(cdist50(ar[i]->fiftyval) < 3) return polarb50(ar[i]->fiftyval);
return 0;
return false;
}
}
@@ -189,7 +189,8 @@ int fiftyval049(cell *c) {
else if(sphere) return 0;
else {
int a[3], qa=0;
int pa = polara50(c), pb = polarb50(c);
bool pa = polara50(c);
bool pb = polarb50(c);
auto ar = gp::get_masters(c);
for(int i=0; i<3; i++)
if(polara50(ar[i]->fiftyval) == pa && polarb50(ar[i]->fiftyval) == pb)
@@ -2105,7 +2106,7 @@ namespace linepatterns {
break;
case patPalace: {
int a = polarb50(c);
bool a = polarb50(c);
if(pseudohept(c)) for(int i=0; i<7; i++) {
cell *c1 = createMov(c, (i+3) % 7);
cell *c2 = createMov(c, (i+4) % 7);