diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-24 20:52:31 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-24 20:52:31 +0000 |
commit | 989c9485083c303472aa7eadc84dd578993f8a9c (patch) | |
tree | 36b890167490e2376a9b610ec568d5f418db5b8f /crawl-ref/source/initfile.cc | |
parent | b3f9dc0237ef7b87dffd6867b4ffeace74e28851 (diff) | |
download | crawl-ref-989c9485083c303472aa7eadc84dd578993f8a9c.tar.gz crawl-ref-989c9485083c303472aa7eadc84dd578993f8a9c.zip |
Move the mpr version of the monster list to output.cc and add it to
the dumped information in the morgue. Change monster naming to the
precise listing of zombie sub types etc. but list monster types in
brackets for non-unique named monsters, so you can now find
information like the following in your morgue file:
"You can see a goblin, an orc, two orc warriors, thirteen friendly orcs,
and the friendly Bogrim (orc priest)."
Since the concise version of the monster list is still an in-game command
('F'), this also neatly solves the problem of orc players not knowing the
type of their followers.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5223 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r-- | crawl-ref/source/initfile.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 2c090643d7..5b8ecad4f2 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -439,7 +439,6 @@ void game_options::new_dump_fields(const std::string &text, bool add) else { for (int f = 0, size = fields.size(); f < size; ++f) - { for (int i = 0, dsize = dump_order.size(); i < dsize; ++i) { if (dump_order[i] == fields[f]) @@ -448,7 +447,6 @@ void game_options::new_dump_fields(const std::string &text, bool add) break; } } - } } } @@ -856,8 +854,8 @@ void game_options::reset_options() // Clear vector options. dump_order.clear(); new_dump_fields("header,hiscore,stats,misc,inventory," - "skills,spells,overview,mutations,messages,screenshot," - "kills,notes"); + "skills,spells,overview,mutations,messages," + "screenshot,monlist,kills,notes"); hp_colour.clear(); hp_colour.push_back(std::pair<int,int>(50, YELLOW)); @@ -2505,10 +2503,9 @@ void game_options::read_option_line(const std::string &str, bool runscript) } else if (key == "dump_kill_places") { - dump_kill_places = - field == "none"? KDO_NO_PLACES : - field == "all" ? KDO_ALL_PLACES : - KDO_ONE_PLACE; + dump_kill_places = (field == "none" ? KDO_NO_PLACES : + field == "all" ? KDO_ALL_PLACES + : KDO_ONE_PLACE); } else if (key == "kill_map") { |