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

added some missing guards for CAP_BT and MAXMDIM

Browse Source
This commit is contained in:
? 2019-02-28 15:03:17 +01:00 committed by Zeno Rogue
parent f451e017a3
commit 81dd0c71da
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cell.cpp
View File

@ -867,8 +867,10 @@ int celldistance(cell *c1, cell *c2) {
return 64; return 64;
} }
#if CAP_BT && MAXMDIM >= 4
if(binarytiling && DIM == 3) if(binarytiling && DIM == 3)
return binary::celldistance3(c1, c2); return binary::celldistance3(c1, c2);
#endif
if(euclid && DIM == 3) if(euclid && DIM == 3)
return euclid3::celldistance(c1, c2); return euclid3::celldistance(c1, c2);

4
geometry.cpp
View File

@ -182,8 +182,12 @@ void precalc() {
rhexf = arcm::current.scale() * .5; rhexf = arcm::current.scale() * .5;
} }
#endif #endif
#if CAP_BT
if(binarytiling) hexvdist = rhexf = 1, tessf = 1, scalefactor = 1, crossf = hcrossf7; if(binarytiling) hexvdist = rhexf = 1, tessf = 1, scalefactor = 1, crossf = hcrossf7;
#endif
#if CAP_BT && MAXMDIM >= 4
if(binarytiling && DIM == 3) binary::build_tmatrix(); if(binarytiling && DIM == 3) binary::build_tmatrix();
#endif
scalefactor = crossf / hcrossf7; scalefactor = crossf / hcrossf7;
orbsize = crossf; orbsize = crossf;

2
polygons.cpp
View File

@ -1942,6 +1942,7 @@ ld dlow_table[SIDEPARS], dhi_table[SIDEPARS];
#define SHADMUL (S3==4 ? 1.05 : 1.3) #define SHADMUL (S3==4 ? 1.05 : 1.3)
#if CAP_BT && MAXMDIM >= 4
void make_wall(hpcshape& sh, int x0, int y0, int z0, int x1, int y1, int z1, int x2, int y2, int z2, int flags) { void make_wall(hpcshape& sh, int x0, int y0, int z0, int x1, int y1, int z1, int x2, int y2, int z2, int flags) {
hyperpoint h0 = point3(x0,y0,z0); hyperpoint h0 = point3(x0,y0,z0);
hyperpoint h1 = point3(x1,y1,z1); hyperpoint h1 = point3(x1,y1,z1);
@ -1978,6 +1979,7 @@ void make_wall(hpcshape& sh, int x0, int y0, int z0, int x1, int y1, int z1, int
at(h0); at(h0);
} }
} }
#endif
void buildpolys() { void buildpolys() {