Skip to content

Commit 0550ea9

Browse files
authored
bigstuff.cpp: fix identation warning
Fixes clang warning ./bigstuff.cpp:1663:5: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]
1 parent f3c06a6 commit 0550ea9

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

bigstuff.cpp

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,56 +1658,56 @@ EX void build_horocycles(cell *c, cell *from) {
16581658
if(ls::single() && !among(specialland, laTemple, laMountain, laClearing, laStorms, laWhirlpool, laCaribbean, laCanvas, laPalace, laPrincessQuest, laCamelot))
16591659
return;
16601660

1661-
// buildbigstuff
1661+
// buildbigstuff
16621662

1663-
if(ls::any_order() && bearsCamelot(c->land) && can_start_horo(c) && !bt::in() &&
1664-
#if MAXMDIM >= 4
1665-
!(hyperbolic && WDIM == 3 && !reg3::in_rule()) &&
1666-
#endif
1667-
(quickfind(laCamelot) || peace::on || (hrand(I2000) < (c->land == laCrossroads4 || ls::no_walls() ? 800 : 200) && horo_ok() &&
1668-
items[itEmerald] >= U5)))
1669-
start_camelot(c);
1663+
if(ls::any_order() && bearsCamelot(c->land) && can_start_horo(c) && !bt::in() &&
1664+
#if MAXMDIM >= 4
1665+
!(hyperbolic && WDIM == 3 && !reg3::in_rule()) &&
1666+
#endif
1667+
(quickfind(laCamelot) || peace::on || (hrand(I2000) < (c->land == laCrossroads4 || ls::no_walls() ? 800 : 200) && horo_ok() &&
1668+
items[itEmerald] >= U5)))
1669+
start_camelot(c);
16701670

1671-
if(c->land == laRlyeh && can_start_horo(c) && (quickfind(laTemple) || peace::on || (hrand(I2000) < 100 && items[itStatue] >= U5)))
1672-
createAlternateMap(c, horo_gen_distance(), hsA);
1671+
if(c->land == laRlyeh && can_start_horo(c) && (quickfind(laTemple) || peace::on || (hrand(I2000) < 100 && items[itStatue] >= U5)))
1672+
createAlternateMap(c, horo_gen_distance(), hsA);
16731673

1674-
if(c->land == laJungle && can_start_horo(c) && (quickfind(laMountain) || (hrand(I2000) < 100 && landUnlocked(laMountain))))
1675-
createAlternateMap(c, horo_gen_distance(), hsA);
1674+
if(c->land == laJungle && can_start_horo(c) && (quickfind(laMountain) || (hrand(I2000) < 100 && landUnlocked(laMountain))))
1675+
createAlternateMap(c, horo_gen_distance(), hsA);
16761676

1677-
if(c->land == laOvergrown && can_start_horo(c) && (quickfind(laClearing) || (hrand(I2000) < 25 && items[itMutant] >= U5 && isLandIngame(laClearing)))) {
1678-
heptagon *h = createAlternateMap(c, horo_gen_distance(), hsA);
1679-
if(h) clearing::bpdata[h].root = NULL;
1680-
}
1677+
if(c->land == laOvergrown && can_start_horo(c) && (quickfind(laClearing) || (hrand(I2000) < 25 && items[itMutant] >= U5 && isLandIngame(laClearing)))) {
1678+
heptagon *h = createAlternateMap(c, horo_gen_distance(), hsA);
1679+
if(h) clearing::bpdata[h].root = NULL;
1680+
}
16811681

1682-
if(stdhyperbolic && c->land == laStorms && can_start_horo(c) && hrand(2000) < 1000) {
1683-
heptagon *h = createAlternateMap(c, horo_gen_distance(), hsA);
1684-
if(h) h->alt->emeraldval = hrand(2);
1685-
}
1682+
if(stdhyperbolic && c->land == laStorms && can_start_horo(c) && hrand(2000) < 1000) {
1683+
heptagon *h = createAlternateMap(c, horo_gen_distance(), hsA);
1684+
if(h) h->alt->emeraldval = hrand(2);
1685+
}
16861686

1687-
if(c->land == laOcean && deepOcean && !generatingEquidistant && !peace::on && can_start_horo(c) &&
1688-
(quickfind(laWhirlpool) || (
1689-
hrand(2000) < (PURE ? 500 : 1000))))
1690-
createAlternateMap(c, horo_gen_distance(), hsA);
1687+
if(c->land == laOcean && deepOcean && !generatingEquidistant && !peace::on && can_start_horo(c) &&
1688+
(quickfind(laWhirlpool) || (
1689+
hrand(2000) < (PURE ? 500 : 1000))))
1690+
createAlternateMap(c, horo_gen_distance(), hsA);
16911691

1692-
#if CAP_COMPLEX2
1693-
if(c->land == laOcean && deepOcean && !generatingEquidistant && hrand(10000) < 20 && no_barriers_in_radius(c, 2) && hyperbolic && !quotient && !tactic::on && !safety)
1694-
brownian::init_further(c);
1695-
#endif
1692+
#if CAP_COMPLEX2
1693+
if(c->land == laOcean && deepOcean && !generatingEquidistant && hrand(10000) < 20 && no_barriers_in_radius(c, 2) && hyperbolic && !quotient && !tactic::on && !safety)
1694+
brownian::init_further(c);
1695+
#endif
16961696

1697-
if(c->land == laCaribbean && can_start_horo(c))
1698-
createAlternateMap(c, horo_gen_distance(), hsA);
1697+
if(c->land == laCaribbean && can_start_horo(c))
1698+
createAlternateMap(c, horo_gen_distance(), hsA);
16991699

1700-
if(c->land == laCanvas && can_start_horo(c) && ls::any_order())
1701-
createAlternateMap(c, horo_gen_distance(), hsA);
1700+
if(c->land == laCanvas && can_start_horo(c) && ls::any_order())
1701+
createAlternateMap(c, horo_gen_distance(), hsA);
17021702

1703-
if(c->land == laPalace && can_start_horo(c) && !princess::generating && !shmup::on && multi::players == 1 && !weirdhyperbolic &&
1704-
(princess::forceMouse ? canReachPlayer(from, moMouse) :
1705-
(hrand(2000) < (peace::on ? 100 : 20))) &&
1706-
(princess::challenge || kills[moVizier] || peace::on)) {
1707-
createAlternateMap(c, PRADIUS0, hsOrigin, waPalace);
1708-
celllister cl(c, 5, 1000000, NULL);
1709-
for(cell *c: cl.lst) if(c->master->alt) currentmap->generateAlts(c->master);
1710-
}
1703+
if(c->land == laPalace && can_start_horo(c) && !princess::generating && !shmup::on && multi::players == 1 && !weirdhyperbolic &&
1704+
(princess::forceMouse ? canReachPlayer(from, moMouse) :
1705+
(hrand(2000) < (peace::on ? 100 : 20))) &&
1706+
(princess::challenge || kills[moVizier] || peace::on)) {
1707+
createAlternateMap(c, PRADIUS0, hsOrigin, waPalace);
1708+
celllister cl(c, 5, 1000000, NULL);
1709+
for(cell *c: cl.lst) if(c->master->alt) currentmap->generateAlts(c->master);
1710+
}
17111711
}
17121712

17131713
EX void buildBigStuff(cell *c, cell *from) {

0 commit comments

Comments
 (0)