diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-05 16:46:35 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-05 16:46:35 +0000 |
| commit | 8b6403164380ecbc2a0a16b15757fd2cdce548eb (patch) | |
| tree | 2f6d8bf84b4be0b82aad5ef055516e758e505b16 /crawl-ref/source/direct.cc | |
| parent | cd9d13b92dee71ff7671c10e69e4508b7554ff69 (diff) | |
| download | crawl-ref-8b6403164380ecbc2a0a16b15757fd2cdce548eb.tar.gz crawl-ref-8b6403164380ecbc2a0a16b15757fd2cdce548eb.zip | |
Merge trunk back into 0.2 for 0.2.2.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1227 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/direct.cc')
| -rw-r--r-- | crawl-ref/source/direct.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index 6cbc6a4120..b260f14dc7 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -103,7 +103,9 @@ static command_type read_direction_key(bool just_looking = false) { flush_input_buffer( FLUSH_BEFORE_COMMAND ); - int key = unmangle_direction_keys(getchm(KC_TARGETING),KC_TARGETING); + const int key = + unmangle_direction_keys( + getchm(KC_TARGETING), KC_TARGETING, false, false); switch ( key ) { @@ -131,9 +133,9 @@ static command_type read_direction_key(bool just_looking = false) case 'p': case 'f': case 't': return CMD_TARGET_PREV_TARGET; case '-': return CMD_TARGET_CYCLE_BACK; - case '+': case '=': return CMD_TARGET_CYCLE_FORWARD; - case ';': case '/': return CMD_TARGET_OBJ_CYCLE_BACK; - case '*': return CMD_TARGET_OBJ_CYCLE_FORWARD; + case '+': case '=': return CMD_TARGET_CYCLE_FORWARD; + case ';': case '/': return CMD_TARGET_OBJ_CYCLE_BACK; + case '*': case '\'': return CMD_TARGET_OBJ_CYCLE_FORWARD; case 'b': return CMD_TARGET_DOWN_LEFT; case 'h': return CMD_TARGET_LEFT; @@ -1398,6 +1400,9 @@ static void describe_mons_enchantment(const monsters &mons, case ENCH_POISON: strcat(info, " is poisoned."); break; + case ENCH_SICK: + strcat(info, " is sick."); + break; case ENCH_ROT: strcat(info, " is rotting away."); //jmf: "covered in sores"? break; |