crossbow:: no time passes when shooting while unstable
This commit is contained in:
parent
8185657768
commit
858db697d8
|
@ -248,6 +248,7 @@ EX void add_fire(cell *c) {
|
||||||
pcmove pcm;
|
pcmove pcm;
|
||||||
pcm.checkonly = false;
|
pcm.checkonly = false;
|
||||||
changes.init(false);
|
changes.init(false);
|
||||||
|
addMessage(XLAT("Fire!"));
|
||||||
bool b = pcm.try_shooting(false);
|
bool b = pcm.try_shooting(false);
|
||||||
if(!b) changes.rollback();
|
if(!b) changes.rollback();
|
||||||
fire_mode = false;
|
fire_mode = false;
|
||||||
|
|
|
@ -265,6 +265,15 @@ bool pcmove::try_shooting(bool auto_target) {
|
||||||
if(gravity_state) markOrb(itOrbGravity);
|
if(gravity_state) markOrb(itOrbGravity);
|
||||||
}
|
}
|
||||||
lastmovetype = lmAttack; lastmove = NULL;
|
lastmovetype = lmAttack; lastmove = NULL;
|
||||||
|
|
||||||
|
if(cellEdgeUnstable(cwt.at) || cwt.at->land == laWhirlpool) {
|
||||||
|
if(checkonly) return true;
|
||||||
|
if(changes.on) changes.commit();
|
||||||
|
addMessage(XLAT("(shooting while unstable -- no turn passes)"));
|
||||||
|
checkmove();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
if(checkNeedMove(checkonly, false))
|
if(checkNeedMove(checkonly, false))
|
||||||
return false;
|
return false;
|
||||||
swordAttackStatic();
|
swordAttackStatic();
|
||||||
|
|
Loading…
Reference in New Issue