diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-29 22:08:55 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-29 22:08:55 +0000 |
| commit | 83043ea070b1f45c5cad9c7ad1f1844a01079809 (patch) | |
| tree | d669c06ff147b25ab3cf4664b47d4edfef9c8aab | |
| parent | e4d56c6724efb4682765a26aa569c2d974ab02d4 (diff) | |
| download | crawl-ref-83043ea070b1f45c5cad9c7ad1f1844a01079809.tar.gz crawl-ref-83043ea070b1f45c5cad9c7ad1f1844a01079809.zip | |
Fix for bug 1571295: should be 'an orc suddenly appears', not
'the orc suddenly appears.'
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1400 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.h | 3 | ||||
| -rw-r--r-- | crawl-ref/source/mstuff2.cc | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index ebfcaebf5e..2d77ae7c63 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1834,7 +1834,8 @@ static void handle_behaviour(monsters *mon) // permitting output of "It" messages for the invisible {dlb} // Intentionally avoids info and str_pass now. -- bwr bool simple_monster_message(const monsters *monster, const char *event, - int channel, int param) + int channel, int param, + description_level_type descrip) { char buff[INFO_SIZE]; @@ -1842,7 +1843,7 @@ bool simple_monster_message(const monsters *monster, const char *event, && (channel == MSGCH_MONSTER_SPELL || player_monster_visible(monster))) { snprintf( buff, sizeof(buff), "%s%s", - ptr_monam(monster, DESC_CAP_THE), event ); + ptr_monam(monster, descrip), event ); mpr( buff, channel, param ); return (true); diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h index 5b38a2f76a..cc308c6a77 100644 --- a/crawl-ref/source/monstuff.h +++ b/crawl-ref/source/monstuff.h @@ -88,7 +88,8 @@ bool random_near_space( int ox, int oy, int &tx, int &ty, * spells2 - spells4 * *********************************************************************** */ bool simple_monster_message(const monsters *monster, const char *event, - int channel = MSGCH_PLAIN, int param = 0); + int channel = MSGCH_PLAIN, int param = 0, + description_level_type descrip = DESC_CAP_THE); /* *********************************************************************** * called from: acr diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index ede520732b..186d1f9ce7 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -870,7 +870,8 @@ void monster_teleport(struct monsters *monster, bool instan, bool silent) if (was_seen) simple_monster_message(monster, " reappears nearby!"); else - simple_monster_message(monster, " appears out of thin air!"); + simple_monster_message(monster, " appears out of thin air!", + MSGCH_PLAIN, 0, DESC_CAP_A); } if (player_monster_visible(monster) && now_visible) |