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

fixed curr_dist and horocycles in Canvas for Euclidedan

This commit is contained in:
Zeno Rogue 2018-09-28 12:27:44 +02:00
parent e10f6564a6
commit ce390de0d2
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigstuff.cpp
View File

@ -44,7 +44,7 @@ int celldistAltRelative(cell *c) {
}
int euclidAlt(short x, short y) {
if(specialland == laTemple || specialland == laClearing) {
if(among(specialland, laTemple, laClearing, laCanvas)) {
if(euclid6)
return max(int(x), x+y);
else if(PURE)
@ -1169,7 +1169,7 @@ void moreBigStuff(cell *c) {
if(d <= PRADIUS1) generateAlts(c->master);
}
if(c->land == laCanvas && c->master->alt)
if(c->land == laCanvas && !eubinary && c->master->alt)
generateAlts(c->master);
if(c->land == laStorms)

3
cell.cpp
View File

@ -1063,9 +1063,6 @@ int celldist(cell *c) {
#define ALTDIST_ERROR 90000
// defined in 'game'
int euclidAlt(short x, short y);
int celldistAlt(cell *c) {
if(masterless) {
if(torus) return celldist(c);

2
expansion.cpp
View File

@ -416,7 +416,7 @@ int curr_dist(cell *c) {
case dfWorld:
if(!mod_allowed() && !among(c->land, laOcean, laIvoryTower, laEndorian, laDungeon, laTemple, laWhirlpool, laCanvas))
return 0;
if(c->master->alt) return celldistAlt(c);
if(eubinary || c->master->alt) return celldistAlt(c);
return inmirror(c) ? (c->landparam & 255) : c->landparam;
}
return 0;

1
hyper.h
View File

@ -4228,6 +4228,7 @@ namespace ts {
}
void generate_around(cell *c);
int euclidAlt(short x, short y);
}