Make failed polearming or jumping return correct value
This commit is contained in:
+5
-5
@@ -1978,7 +1978,7 @@ jump(int magic) /* 0=Physical, otherwise skill level */
|
|||||||
if (getpos(&cc, TRUE, "the desired position") < 0)
|
if (getpos(&cc, TRUE, "the desired position") < 0)
|
||||||
return ECMD_CANCEL; /* user pressed ESC */
|
return ECMD_CANCEL; /* user pressed ESC */
|
||||||
if (!is_valid_jump_pos(cc.x, cc.y, magic, TRUE)) {
|
if (!is_valid_jump_pos(cc.x, cc.y, magic, TRUE)) {
|
||||||
return ECMD_OK;
|
return ECMD_FAIL;
|
||||||
} else {
|
} else {
|
||||||
coord uc;
|
coord uc;
|
||||||
int range, temp;
|
int range, temp;
|
||||||
@@ -3288,19 +3288,19 @@ use_pole(struct obj *obj, boolean autohit)
|
|||||||
glyph = glyph_at(cc.x, cc.y);
|
glyph = glyph_at(cc.x, cc.y);
|
||||||
if (distu(cc.x, cc.y) > max_range) {
|
if (distu(cc.x, cc.y) > max_range) {
|
||||||
pline("Too far!");
|
pline("Too far!");
|
||||||
return res;
|
return ECMD_FAIL;
|
||||||
} else if (distu(cc.x, cc.y) < min_range) {
|
} else if (distu(cc.x, cc.y) < min_range) {
|
||||||
if (autohit && u_at(cc.x, cc.y))
|
if (autohit && u_at(cc.x, cc.y))
|
||||||
pline("Don't know what to hit.");
|
pline("Don't know what to hit.");
|
||||||
else
|
else
|
||||||
pline("Too close!");
|
pline("Too close!");
|
||||||
return res;
|
return ECMD_FAIL;
|
||||||
} else if (!cansee(cc.x, cc.y) && !glyph_is_poleable(glyph)) {
|
} else if (!cansee(cc.x, cc.y) && !glyph_is_poleable(glyph)) {
|
||||||
You(cant_see_spot);
|
You(cant_see_spot);
|
||||||
return res;
|
return ECMD_FAIL;
|
||||||
} else if (!couldsee(cc.x, cc.y)) { /* Eyes of the Overworld */
|
} else if (!couldsee(cc.x, cc.y)) { /* Eyes of the Overworld */
|
||||||
You(cant_reach);
|
You(cant_reach);
|
||||||
return res;
|
return ECMD_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
g.context.polearm.hitmon = (struct monst *) 0;
|
g.context.polearm.hitmon = (struct monst *) 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user