summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/main.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-10 18:22:58 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-10 18:24:05 +0530
commit8a78afdcea14016d0471fe74cc66a943c8fd616a (patch)
tree6b620847a4af5cde2ae851dd501bb14c20540a21 /crawl-ref/source/main.cc
parent1acfe36802a6db5f6d2d6ed47b57c210b4136e72 (diff)
downloadcrawl-ref-8a78afdcea14016d0471fe74cc66a943c8fd616a.tar.gz
crawl-ref-8a78afdcea14016d0471fe74cc66a943c8fd616a.zip
Remove resist slowing, increment tag major version.
Diffstat (limited to 'crawl-ref/source/main.cc')
-rw-r--r--crawl-ref/source/main.cc22
1 files changed, 2 insertions, 20 deletions
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 5a8a06dca9..bd226dc7d8 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -2503,26 +2503,8 @@ static void _decrement_durations()
// slowing, exhaustion still ends haste.
if (you.duration[DUR_HASTE] > 0)
{
- if (wearing_amulet(AMU_RESIST_SLOW))
- {
- if (you.duration[DUR_HASTE] > 3 * BASELINE_DELAY)
- {
- you.set_duration(DUR_HASTE, div_rand_round(2 + coinflip(), 2));
- mpr("Your extra speed is starting to run out.",
- MSGCH_DURATION);
- }
- else
- {
- mpr("You feel yourself slow down.", MSGCH_DURATION);
- you.duration[DUR_HASTE] = 0;
- }
- did_god_conduct(DID_HASTY, 3, true);
- }
- else
- {
- // Silently cancel haste, then slow player.
- you.duration[DUR_HASTE] = 0;
- }
+ // Silently cancel haste, then slow player.
+ you.duration[DUR_HASTE] = 0;
}
slow_player(dur);
}