1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-01-13 06:22:39 +00:00

replaced 'archimedean' with 'arcm::in()'

This commit is contained in:
Zeno Rogue
2019-12-14 11:42:16 +01:00
parent d529449999
commit f772f9b7fd
28 changed files with 138 additions and 136 deletions

View File

@@ -973,7 +973,7 @@ EX ld master_to_c7_angle() {
#if CAP_GP
if(cgi.gpdata) alpha = cgi.gpdata->alpha;
#endif
return (!BITRUNCATED && !binarytiling && !archimedean) ? M_PI + alpha : 0;
return (!BITRUNCATED && !binarytiling && !arcm::in()) ? M_PI + alpha : 0;
}
EX transmatrix actualV(const heptspin& hs, const transmatrix& V) {
@@ -984,7 +984,7 @@ EX transmatrix actualV(const heptspin& hs, const transmatrix& V) {
return V * spin(M_PI + 2 * M_PI / S7 * (hs.spin + irr::periodmap[hs.at].base.spin));
#endif
#if CAP_ARCM
if(archimedean) return V * spin(-arcm::current.triangles[arcm::id_of(hs.at)][hs.spin].first);
if(arcm::in()) return V * spin(-arcm::current.triangles[arcm::id_of(hs.at)][hs.spin].first);
#endif
#if CAP_BT
if(binarytiling) return V;