diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-11 20:40:13 -0700 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-11 20:56:37 -0700 |
| commit | daae54a4133a85a6393b9351f17d825cfdcdd126 (patch) | |
| tree | a2043f59b2c2e9e0a1dda1f0a68ba43c24764efe /crawl-ref/source/beam.cc | |
| parent | 30d9616ef6d9e0f6e5bccaacf4446854ceb757be (diff) | |
| download | crawl-ref-daae54a4133a85a6393b9351f17d825cfdcdd126.tar.gz crawl-ref-daae54a4133a85a6393b9351f17d825cfdcdd126.zip | |
Improve sleep code
Refactor put_to_sleep() and hibernate() together. Also improve
messenging for resisting repeated sleep (by replacing a generic
canned message).
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 97b0751809..288a0659f7 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3516,11 +3516,8 @@ void bolt::affect_player_enchantment(bool resistible) switch (flavour) { case BEAM_HIBERNATION: - you.hibernate(ench_power); - break; - case BEAM_SLEEP: - you.put_to_sleep(NULL, ench_power); + you.put_to_sleep(NULL, ench_power, flavour == BEAM_HIBERNATION); break; case BEAM_CORONA: @@ -5408,7 +5405,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monster* mon) { if (simple_monster_message(mon, " looks drowsy...")) obvious_effect = true; - mon->hibernate(); + mon->put_to_sleep(agent(), ench_power, true); return MON_AFFECTED; } return MON_UNAFFECTED; |