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

fixed crashes with Canvas

Browse Source
This commit is contained in:
Zeno Rogue 2021-04-23 20:23:49 +02:00
parent d63ab2f1a2
commit 831d699270
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigstuff.cpp
View File

@ -1365,7 +1365,6 @@ EX int wallchance(cell *c, bool deepOcean) {
l == laCaribbean ? 500 : l == laCaribbean ? 500 :
(l == laWarpSea || l == laWarpCoast) ? 500 : (l == laWarpSea || l == laWarpCoast) ? 500 :
l == laStorms ? 250 : l == laStorms ? 250 :
l == laCanvas ? 0 :
l == laHaunted ? 0 : l == laHaunted ? 0 :
(l == laGraveyard && !deepOcean) ? 0 : (l == laGraveyard && !deepOcean) ? 0 :
// (l == laGraveyard && items[itBone] >= 10) ? 120 : // (l == laGraveyard && items[itBone] >= 10) ? 120 :
@ -1637,7 +1636,7 @@ EX void build_horocycles(cell *c, cell *from) {
if(c->land == laCaribbean && horo_ok() && ctof(c) && !c->master->alt) if(c->land == laCaribbean && horo_ok() && ctof(c) && !c->master->alt)
createAlternateMap(c, horo_gen_distance(), hsA); createAlternateMap(c, horo_gen_distance(), hsA);
if(c->land == laCanvas && horo_ok() && ctof(c) && !c->master->alt) if(c->land == laCanvas && horo_ok() && ctof(c) && !c->master->alt && ls::any_order())
createAlternateMap(c, horo_gen_distance(), hsA); createAlternateMap(c, horo_gen_distance(), hsA);
if(c->land == laPalace && ctof(c) && !princess::generating && !shmup::on && multi::players == 1 && horo_ok() && !weirdhyperbolic && if(c->land == laPalace && ctof(c) && !princess::generating && !shmup::on && multi::players == 1 && horo_ok() && !weirdhyperbolic &&
@ -1814,7 +1813,7 @@ EX void moreBigStuff(cell *c) {
if(d <= PRADIUS1) currentmap->generateAlts(c->master); if(d <= PRADIUS1) currentmap->generateAlts(c->master);
} }
if(c->land == laCanvas && !eubinary && c->master->alt && !quotient) if(c->land == laCanvas && !eubinary && c->master->alt && !quotient && (ls::single() || celldistAlt(c) <= 0))
currentmap->generateAlts(c->master); currentmap->generateAlts(c->master);
if(c->land == laStorms) if(c->land == laStorms)

2
system.cpp
View File

@ -211,7 +211,7 @@ EX void initgame() {
pregen(); pregen();
setdist(cwt.at, BARLEV, NULL); setdist(cwt.at, BARLEV, NULL);
if(isCyclic(specialland)) { if(isCyclic(specialland) || specialland == laCanvas) {
#if CAP_COMPLEX2 #if CAP_COMPLEX2
camelot::anthraxBonus = items[itHolyGrail]; camelot::anthraxBonus = items[itHolyGrail];
#endif #endif