Make extended commands return defined flags

Instead of returning 0 or 1, we'll now use ECMD_OK or ECMD_TURN.
These have the same meaning as the hardcoded numbers; ECMD_TURN
means the command uses a turn.

In future, could add eg. a flag denoting "user cancelled command"
or "command failed", and should clear eg. the cmdq.

Mostly this was simply replacing return values with the defines
in the extended commands, so hopefully I didn't break anything.
This commit is contained in:
Pasi Kallinen
2021-12-30 18:46:30 +02:00
parent 511ce70309
commit d53cd28d46
46 changed files with 821 additions and 793 deletions

View File

@@ -4347,27 +4347,27 @@ drain_en(int n)
}
}
/* disarm a trap */
/* the #untrap command - disarm a trap */
int
dountrap(void)
{
if (near_capacity() >= HVY_ENCUMBER) {
pline("You're too strained to do that.");
return 0;
return ECMD_OK;
}
if ((nohands(g.youmonst.data) && !webmaker(g.youmonst.data))
|| !g.youmonst.data->mmove) {
pline("And just how do you expect to do that?");
return 0;
return ECMD_OK;
} else if (u.ustuck && sticks(g.youmonst.data)) {
pline("You'll have to let go of %s first.", mon_nam(u.ustuck));
return 0;
return ECMD_OK;
}
if (u.ustuck || (welded(uwep) && bimanual(uwep))) {
Your("%s seem to be too busy for that.", makeplural(body_part(HAND)));
return 0;
return ECMD_OK;
}
return untrap(FALSE);
return untrap(FALSE) ? ECMD_TIME : ECMD_OK;
}
/* Probability of disabling a trap. Helge Hafting */