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

fixed the barrier-nowall generation in a4

Browse Source
This commit is contained in:
Zeno Rogue 2018-07-10 23:02:27 +02:00
parent 3345999180
commit ba587ae40d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
barriers.cpp
View File

@ -96,6 +96,8 @@ bool checkBarriersNowall(cellwalker bb, int q, int dir, eLand l1=laNone, eLand l
} }
else if(S3==4) { else if(S3==4) {
bb = bb + dir + wstep + dir; bb = bb + dir + wstep + dir;
dir = -dir;
swap(l1, l2);
} }
else { else {
bb = bb + (dir>0?3:4) + wstep - (dir>0?3:4); bb = bb + (dir>0?3:4) + wstep - (dir>0?3:4);
@ -744,10 +746,11 @@ bool buildBarrierNowall(cell *c, eLand l2, int forced_dir) {
for(int j=0; j<c->type; j++) swap(ds[j], ds[hrand(j+1)]); for(int j=0; j<c->type; j++) swap(ds[j], ds[hrand(j+1)]);
for(int i=0; i<c->type; i++) { for(int i=0; i<c->type; i++) {
int d = forced_dir != NODIR ? forced_dir : (S3>3 && nonbitrunc) ? (2+(i&1)) : ds[i]; int d = forced_dir != NODIR ? forced_dir : (S3>3 && nonbitrunc && !gp::on) ? (2+(i&1)) : ds[i];
/* if(warpv && gp::on) { /* if(warpv && gp::on) {
d = hrand(c->type); */ d = hrand(c->type); */
if(warpv && c->mov[d] && c->mov[d]->mpdist < c->mpdist) continue; if(warpv && c->mov[d] && c->mov[d]->mpdist < c->mpdist) continue;
if(gp::on && a4 && c->mov[d] && c->mov[d]->mpdist <= c->mpdist) continue;
/* } /* }
else else
d = (S3>3 && !warpv) ? (2+(i&1)) : dtab[i]; */ d = (S3>3 && !warpv) ? (2+(i&1)) : dtab[i]; */