diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-25 12:05:29 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-25 12:05:29 +0000 |
commit | 4779ce0e5239186180f9139678ef090b0fc7b856 (patch) | |
tree | cc4271a3bcd6315c2ea12fb46d6a465e82dda5dd /crawl-ref/source/notes.cc | |
parent | ea472cc73c9521ecd702fc3f42e2c709f817eda8 (diff) | |
download | crawl-ref-4779ce0e5239186180f9139678ef090b0fc7b856.tar.gz crawl-ref-4779ce0e5239186180f9139678ef090b0fc7b856.zip |
The "Place:" for ziggurats now displays as "Ziggurat:1"/"Ziggurat:2"/etc
instead of "A Ziggurat".
Notes now remember which type of portal you entered:
153 | Portal | Entered level 1 of a ziggurat.
168 | Portal | Entered level 2 of a ziggurat.
189 | Bazaar | Entered a bazaar.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7606 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/notes.cc')
-rw-r--r-- | crawl-ref/source/notes.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc index dbdb0bcdca..e3018971e3 100644 --- a/crawl-ref/source/notes.cc +++ b/crawl-ref/source/notes.cc @@ -249,8 +249,12 @@ std::string Note::describe( bool when, bool where, bool what ) const if (where) { - result << "| " << std::setw(7) << std::left - << short_place_name(packed_place) << " | "; + if (type == NOTE_DUNGEON_LEVEL_CHANGE && !name.empty()) + result << "| " << std::setw(7) << std::left + << name << " | "; + else + result << "| " << std::setw(7) << std::left + << short_place_name(packed_place) << " | "; } if (what) @@ -276,7 +280,10 @@ std::string Note::describe( bool when, bool where, bool what ) const result << "Reached XP level " << first << ". " << name; break; case NOTE_DUNGEON_LEVEL_CHANGE: - result << "Entered " << place_name(packed_place, true, true); + if ( !desc.empty() ) + result << desc; + else + result << "Entered " << place_name(packed_place, true, true); break; case NOTE_LEARN_SPELL: result << "Learned a level " |