diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 15:08:48 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 15:08:48 +0000 |
| commit | a291e99809652bb3308f08d777bafb134328d835 (patch) | |
| tree | e6fa16ffe6ec572ac2f8ba44a62575d70a2e6bfe /crawl-ref/source/delay.cc | |
| parent | 7dd20bb5af17f48ca9a2ff5e4d63cd494e0498de (diff) | |
| download | crawl-ref-a291e99809652bb3308f08d777bafb134328d835.tar.gz crawl-ref-a291e99809652bb3308f08d777bafb134328d835.zip | |
Disallow quivering equipped items. (You can still (fi)re your wielded
weapon if you insist, you just can't quiver it.)
And another general clean-up.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6149 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 52d5dac604..174da7e550 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -1264,7 +1264,7 @@ static void _armour_wear_effects(const int item_slot) if (you.duration[DUR_ICY_ARMOUR] != 0) { mpr( "Your icy armour melts away.", MSGCH_DURATION ); - you.redraw_armour_class = 1; + you.redraw_armour_class = true; you.duration[DUR_ICY_ARMOUR] = 0; } } @@ -1344,7 +1344,7 @@ static void _armour_wear_effects(const int item_slot) case SPARM_PONDEROUSNESS: mpr("You feel rather ponderous."); // you.speed += 2; - you.redraw_evasion = 1; + you.redraw_evasion = true; break; case SPARM_LEVITATION: @@ -1408,12 +1408,13 @@ static void _armour_wear_effects(const int item_slot) static command_type _get_running_command() { - if ( kbhit() ) + if (kbhit()) { stop_running(); return CMD_NO_CMD; } - if ( is_resting() ) + + if (is_resting()) { you.running.rest(); if (!is_resting() && you.running.hp == you.hp @@ -1424,9 +1425,7 @@ static command_type _get_running_command() return CMD_MOVE_NOWHERE; } else if (Options.travel_delay > 0) - { delay(Options.travel_delay); - } return direction_to_command( you.running.x, you.running.y ); } |