diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-29 18:12:52 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-29 18:12:52 +0000 |
| commit | 61b0a568e4ac1a1c2c7fb8d038144488c0cd14d2 (patch) | |
| tree | 1fb3a52208649aad9190b3640726ed0d0cb56dec /crawl-ref/source/acr.cc | |
| parent | 828402203ba5dabe03082ad8a0768a4b6a66e542 (diff) | |
| download | crawl-ref-61b0a568e4ac1a1c2c7fb8d038144488c0cd14d2.tar.gz crawl-ref-61b0a568e4ac1a1c2c7fb8d038144488c0cd14d2.zip | |
Redid how the resists screen works (both in-game and in-dump.)
Minor notes refactoring.
Added a basic notes browser on '_'.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@528 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index bc04926c5a..9adaefda6a 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -839,8 +839,8 @@ static void input() { you.turn_is_over = false; prep_input(); - /* you.paralysis check */ - if ( you.paralysis ) { + if ( you.paralysis ) + { world_reacts(); return; } @@ -851,13 +851,14 @@ static void input() { gotoxy(18,9); - if ( you_are_delayed() ) { + if ( you_are_delayed() ) + { world_reacts(); return; } - /* Change from previous code! */ - if ( you.turn_is_over ) { + if ( you.turn_is_over ) + { world_reacts(); return; } @@ -1040,6 +1041,10 @@ void process_command( command_type cmd ) { make_user_note(); break; + case CMD_DISPLAY_NOTES: + display_notes(); + break; + case CMD_CLEAR_MAP: if (you.level_type != LEVEL_LABYRINTH && you.level_type != LEVEL_ABYSS) { @@ -2345,6 +2350,7 @@ command_type keycode_to_command( keycode_type key ) { case '%': return CMD_RESISTS_SCREEN; case ',': return CMD_PICKUP; case ':': return CMD_MAKE_NOTE; + case '_': return CMD_DISPLAY_NOTES; case ';': return CMD_INSPECT_FLOOR; case '!': return CMD_SHOUT; case '^': return CMD_DISPLAY_RELIGION; |