From e3e52a2f0833e09c63b5a3265d96c6d892dacd30 Mon Sep 17 00:00:00 2001 From: haranp Date: Wed, 24 Jan 2007 22:32:09 +0000 Subject: Stage 1 of the direction() rewrite. I am committing this even though it isn't complete yet, because: (a) it's good enough now that I like it better than the old version (b) feedback and testing is badly needed. Direction selection has been redone and is no longer modal. You now use the normal arrow or vi keys to move around. If you want to select a direction, as opposed to a specific target square, use the Shift- versions of the movement keys. This might not work with arrow keys on some systems; it's hard for me to check on my own system. Most of the other keys should work, but I'm not sure I've got them all. ';', '+', '-', '.', ' ' (== '.'), 't', 'f', 'p' all work. 'x' (from the main screen) still calls look_around(), not the new direction code, so you have some room to compare. The confirm_* options are now meaningless and will be removed shortly. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@880 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/enum.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/enum.h') diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index fc89fe9381..3b925ee6ac 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -491,11 +491,7 @@ enum canned_message_type // canned_msg() - unsigned char MSG_UNTHINKING_ACT, MSG_SPELL_FIZZLES, MSG_HUH, - MSG_EMPTY_HANDED, - MSG_NOT_IN_PRESENT_FORM, - MSG_TOO_CONFUSED, - MSG_DISORIENTED, - MSG_CANT_REACH + MSG_EMPTY_HANDED }; enum char_set_type @@ -686,6 +682,16 @@ enum command_type CMD_TARGET_UP_LEFT, CMD_TARGET_UP, CMD_TARGET_UP_RIGHT, + + CMD_TARGET_DIR_DOWN_LEFT, + CMD_TARGET_DIR_DOWN, + CMD_TARGET_DIR_DOWN_RIGHT, + CMD_TARGET_DIR_LEFT, + CMD_TARGET_DIR_RIGHT, + CMD_TARGET_DIR_UP_LEFT, + CMD_TARGET_DIR_UP, + CMD_TARGET_DIR_UP_RIGHT, + CMD_TARGET_CYCLE_TARGET_MODE, CMD_TARGET_PREV_TARGET, CMD_TARGET_SELECT, -- cgit v1.2.3-54-g00ecf