diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-15 15:33:21 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-15 15:33:21 +0000 |
| commit | 1a2eb5c482d9754544d267ff71bbec4c7411ab60 (patch) | |
| tree | f2da0a7ee403c20482963f0ea670b8a0438c9138 /crawl-ref/source/item_use.cc | |
| parent | 2072d2654f4f2dc65110a8b3f221ab731bea2f28 (diff) | |
| download | crawl-ref-1a2eb5c482d9754544d267ff71bbec4c7411ab60.tar.gz crawl-ref-1a2eb5c482d9754544d267ff71bbec4c7411ab60.zip | |
Fixed a bug that made silence last forever. This also meant
moving "Your hearing returns." where it belongs, thus
fixing 1773460.
I also moved a couple of messages (namely weapon noises, and
hell effects) into MSGCH_TALK and MSGCH_SOUND, both of which
now are ignored as travel stoppers. I didn't check all
instances of potential talk and noises, but if there are
cases where we want a message to always stop resting, we
could move the message in question to MSGCH_WARN or
MSGCH_MONSTER_SPELL. Conversely, there's probably lots of
stuff around that could also get ignored.
Users can still specify messages in stop_travel that will
interrupt both rest and travel. (There's currently no
distinction, and I made no changes on that account.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2089 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 9df636088b..c3174898fb 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -475,7 +475,10 @@ void wield_effects(int item_wield_2, bool showMsgs) break; case SPWPN_ELECTROCUTION: - mpr("You hear the crackle of electricity."); + if (!silenced(you.x_pos, you.y_pos)) + mpr("You hear the crackle of electricity.", MSGCH_SOUND); + else + mpr("You see sparks fly."); break; case SPWPN_ORC_SLAYING: @@ -529,9 +532,9 @@ void wield_effects(int item_wield_2, bool showMsgs) case SPWPN_SINGING_SWORD: if (!was_known) - mprf("%s says, 'Hi! I'm the Singing Sword!'", old_desc); + mprf(MSGCH_TALK, "%s says, 'Hi! I'm the Singing Sword!'", old_desc); else - mpr("The Singing Sword hums in delight!"); + mpr("The Singing Sword hums in delight!", MSGCH_TALK); break; case SPWPN_WRATH_OF_TROG: |