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

fixed some potential issues with arb

This commit is contained in:
Zeno Rogue 2020-08-02 13:01:55 +02:00
parent 6c96349714
commit 554567e0cf
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigstuff.cpp
View File

@ -1376,7 +1376,7 @@ EX int wallchance(cell *c, bool deepOcean) {
/** should we generate the horocycles in the current geometry? */
EX bool horo_ok() {
if(INVERSE) return false;
return hyperbolic && !bt::in() && !arcm::in() && !kite::in() && !experimental && !hybri;
return hyperbolic && !bt::in() && !arcm::in() && !kite::in() && !experimental && !hybri && !arb::in();
}
EX bool gp_wall_test() {

4
cell.cpp
View File

@ -477,7 +477,7 @@ EX int celldist(cell *c) {
#if CAP_IRR
if(IRREGULAR) return irr::celldist(c, false);
#endif
if(arcm::in() || ctof(c)) return c->master->distance;
if(arcm::in() || ctof(c) || arb::in()) return c->master->distance;
#if CAP_GP
if(INVERSE) {
cell *c1 = gp::get_mapped(c);
@ -1116,7 +1116,7 @@ EX int celldistance(cell *c1, cell *c2) {
return euc::cyldist(euc2_coordinates(c1), euc2_coordinates(c2));
}
if(arcm::in() || quotient || sn::in() || (kite::in() && euclid) || experimental || sl2 || nil)
if(arcm::in() || quotient || sn::in() || (kite::in() && euclid) || experimental || sl2 || nil || arb::in())
return clueless_celldistance(c1, c2);
if(S3 >= OINF) return inforder::celldistance(c1, c2);

1
pattern2.cpp
View File

@ -383,6 +383,7 @@ EX pair<int, bool> fieldval(cell *c) {
EX int fieldval_uniq(cell *c) {
if(fake::in()) return FPIU(fieldval_uniq(c));
if(experimental) return 0;
else if(arb::in()) return arb::id_of(c->master);
else if(hybri) {
auto c1 = hybrid::get_where(c).first;
return PIU ( fieldval_uniq(c1) );