diff --git a/complex2.cpp b/complex2.cpp index 86eb0e05..290fe83f 100644 --- a/complex2.cpp +++ b/complex2.cpp @@ -1275,7 +1275,7 @@ EX namespace dice { base_to_base = -h[2]; else { ld lim = sphere ? 1 : 5; - base_to_base = binsearch(-lim, lim, [h, osphere] (ld d) { + base_to_base = binsearch(-lim, lim, [h] (ld d) { return (zpush(d) * h)[2] >= sin_auto(vid.depth); }); } diff --git a/monstermove.cpp b/monstermove.cpp index 984216c8..085d93c4 100644 --- a/monstermove.cpp +++ b/monstermove.cpp @@ -674,7 +674,7 @@ EX void beastAttack(cell *c, bool player, bool targetdir) { if(c2->wall == waThumperOn) { cellwalker bull (c, d); int subdir = determinizeBullPush(bull); - auto mi = determinePush(bull, subdir, [c, c2] (movei mi) { return canPushThumperOn(mi, c); }); + auto mi = determinePush(bull, subdir, [c] (movei mi) { return canPushThumperOn(mi, c); }); if(mi.proper()) pushThumper(mi); } diff --git a/pcmove.cpp b/pcmove.cpp index 385cd4d0..7d5bc2e2 100644 --- a/pcmove.cpp +++ b/pcmove.cpp @@ -630,7 +630,7 @@ bool pcmove::actual_move() { } if(c2->monst == moAnimatedDie) { - mip = determinePush(cwt, subdir, [c2] (movei mi) { return canPushThumperOn(mi, cwt.at); }); + mip = determinePush(cwt, subdir, [] (movei mi) { return canPushThumperOn(mi, cwt.at); }); if(mip.proper()) { auto tgt = roll_effect(mip, dice::data[c2]); if(tgt.happy() > 0) { @@ -642,7 +642,7 @@ bool pcmove::actual_move() { } if(isPushable(c2->wall) && !c2->monst && !nonAdjacentPlayer(c2, cwt.at) && fmsMove) { - mip = determinePush(cwt, subdir, [c2] (movei mi) { return canPushThumperOn(mi, cwt.at); }); + mip = determinePush(cwt, subdir, [] (movei mi) { return canPushThumperOn(mi, cwt.at); }); if(mip.t) changes.ccell(mip.t); if(mip.d == NO_SPACE) { if(vmsg(miWALL)) addMessage(XLAT("No room to push %the1.", c2->wall)); @@ -980,7 +980,7 @@ bool pcmove::attack() { if(items[itCurseWeakness] || (isStunnable(c2->monst) && c2->hitpoints > 1)) { if(monsterPushable(c2)) - mip = determinePush(cwt, subdir, [c2] (movei mi) { return passable(mi.t, mi.s, P_BLOW); }); + mip = determinePush(cwt, subdir, [] (movei mi) { return passable(mi.t, mi.s, P_BLOW); }); else mip.t = c2; if(mip.t) changes.ccell(mip.t); diff --git a/shmup.cpp b/shmup.cpp index e00e5e99..fa62a65a 100644 --- a/shmup.cpp +++ b/shmup.cpp @@ -1124,7 +1124,7 @@ void movePlayer(monster *m, int delta) { if(dbase); }); + auto mip = determinePush(cellwalker(c2, sd1)+wstep, subdir, [m] (movei mi) { return canPushThumperOn(mi, m->base); }); visibleFor(300); if(!mip.proper()) go = false; else pushThumper(mip);