diff options
| -rw-r--r-- | crawl-ref/source/direct.cc | 11 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index c43c89ab6b..d851b4d504 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -133,7 +133,8 @@ static command_type read_direction_key(bool just_looking = false) case '>': return CMD_TARGET_FIND_DOWNSTAIR; case CONTROL('F'): return CMD_TARGET_CYCLE_TARGET_MODE; - case 'p': case 'f': case 't': return CMD_TARGET_PREV_TARGET; + case 'p': return CMD_TARGET_PREV_TARGET; + case 'f': case 't': return CMD_TARGET_MAYBE_PREV_TARGET; case '-': return CMD_TARGET_CYCLE_BACK; case '+': case '=': return CMD_TARGET_CYCLE_FORWARD; @@ -386,6 +387,14 @@ void direction(struct dist& moves, targeting_type restricts, target_unshifted = false; } + if ( key_command == CMD_TARGET_MAYBE_PREV_TARGET ) + { + if ( moves.tx == you.x_pos && moves.ty == you.y_pos ) + key_command = CMD_TARGET_PREV_TARGET; + else + key_command = CMD_TARGET_SELECT; + } + bool need_beam_redraw = false; bool force_redraw = false; bool loop_done = false; diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index ac9353569c..7b0caa19c0 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -727,6 +727,7 @@ enum command_type CMD_TARGET_CYCLE_TARGET_MODE, CMD_TARGET_PREV_TARGET, + CMD_TARGET_MAYBE_PREV_TARGET, CMD_TARGET_SELECT, CMD_TARGET_SELECT_ENDPOINT, CMD_TARGET_OBJ_CYCLE_BACK, |