1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-06 08:43:02 +00:00

replaced macro VALENCE with function valence()

This commit is contained in:
Zeno Rogue
2019-12-14 12:31:20 +01:00
parent 769982040d
commit 7f09bb6259
10 changed files with 29 additions and 21 deletions

View File

@@ -1141,7 +1141,7 @@ EX int mine_adjacency_rule = 0;
EX map<cell*, vector<cell*>> adj_memo;
EX bool geometry_has_alt_mine_rule() {
if(WDIM == 2) return VALENCE > 3;
if(WDIM == 2) return valence() > 3;
if(WDIM == 3) return !among(geometry, gHoroHex, gCell5, gBitrunc3, gCell8, gECell8, gCell120, gECell120);
return true;
}
@@ -1241,4 +1241,12 @@ EX bool standard_tiling() {
return !arcm::in() && !kite::in() && !bt::in();
}
EX int valence() {
if(BITRUNCATED) return 3;
#if CAP_ARCM
if(arcm::in()) return arcm::valence();
#endif
return S3;
}
}