diff options
| -rw-r--r-- | crawl-ref/docs/crawl_options.txt | 2 | ||||
| -rw-r--r-- | crawl-ref/init.txt | 4 | ||||
| -rw-r--r-- | crawl-ref/source/chardump.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/overmap.cc | 10 | ||||
| -rw-r--r-- | crawl-ref/source/overmap.h | 1 |
6 files changed, 22 insertions, 6 deletions
diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt index 5171ec2b71..5b896f4edb 100644 --- a/crawl-ref/docs/crawl_options.txt +++ b/crawl-ref/docs/crawl_options.txt @@ -845,7 +845,7 @@ dump_message_count = 7 The number of last messages to be displayed in character dump files. dump_order = header,stats,misc,notes,inventory,skills -dump_order += spells,mutations,messages,screenshot,kills +dump_order += spells,overview,mutations,messages,screenshot,kills Controls the order of sections in the dump. You can use multiple dump_order lines - all lines but the first must use dump_order += diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt index 02c442f51f..4a4af3b7fa 100644 --- a/crawl-ref/init.txt +++ b/crawl-ref/init.txt @@ -189,7 +189,7 @@ fire_order = launcher, dart, stone, dagger, spear, handaxe, club # dump_item_origin_price = 100 # dump_message_count = 7 # dump_order = header,stats,misc,notes,inventory,skills -# dump_order += spells,mutations,messages,screenshot,kills +# dump_order += spells,overview,mutations,messages,screenshot,kills ##### 5-b Notes ################################# # @@ -216,4 +216,4 @@ fire_order = launcher, dart, stone, dagger, spear, handaxe, club ##### 6-b DOS and Windows ####################### # -# dos_use_background_intensity = true
\ No newline at end of file +# dos_use_background_intensity = true diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc index 0c3b343e66..b96e6ff18b 100644 --- a/crawl-ref/source/chardump.cc +++ b/crawl-ref/source/chardump.cc @@ -45,6 +45,7 @@ #include "mutation.h" #include "notes.h" #include "output.h" +#include "overmap.h" #include "player.h" #include "randart.h" #include "religion.h" @@ -78,6 +79,7 @@ static void sdump_messages(const std::string §ion, std::string &text); static void sdump_screenshot(const std::string §ion, std::string &text); static void sdump_kills(const std::string §ion, std::string &text); static void sdump_newline(const std::string §ion, std::string &text); +static void sdump_overview(const std::string §ion, std::string &text); static void sdump_separator(const std::string §ion, std::string &text); #ifdef CLUA_BINDINGS static void sdump_lua(const std::string §ion, std::string &text); @@ -110,6 +112,7 @@ static dump_section_handler dump_handlers[] = { { "messages", sdump_messages }, { "screenshot", sdump_screenshot }, { "kills", sdump_kills }, + { "overview", sdump_overview }, // Conveniences for the .crawlrc artist. { "", sdump_newline }, @@ -943,6 +946,11 @@ static void sdump_kills(const std::string &, std::string & text) text += you.kills.kill_info(); } +static void sdump_overview(const std::string&, std::string& text) +{ + text += formatted_string::parse_string(overview_description_string()); +} + static void sdump_mutations(const std::string &, std::string & text) { // Can't use how_mutated() here, as it doesn't count demonic powers diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 529ab76e3a..e340d4c83c 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -703,7 +703,8 @@ void game_options::reset_options() // Clear vector options. dump_order.clear(); new_dump_fields("header,stats,misc,inventory,skills," - "spells,,mutations,messages,screenshot,kills,notes"); + "spells,,overview,mutations,messages,screenshot," + "kills,notes"); banned_objects.clear(); note_monsters.clear(); diff --git a/crawl-ref/source/overmap.cc b/crawl-ref/source/overmap.cc index 6e4c250dbc..e3cb754526 100644 --- a/crawl-ref/source/overmap.cc +++ b/crawl-ref/source/overmap.cc @@ -95,7 +95,7 @@ static char shoptype_to_char(shop_type s) case SHOP_WAND: return '/'; case SHOP_BOOK: - return ':'; + return '+'; case SHOP_FOOD: return '%'; case SHOP_DISTILLERY: @@ -107,7 +107,7 @@ static char shoptype_to_char(shop_type s) } } -void display_overmap() +std::string overview_description_string() { char buffer[100]; std::string disp; @@ -279,6 +279,12 @@ void display_overmap() if (!seen_anything) disp += "You haven't discovered anything interesting yet."; + return disp; +} + +void display_overmap() +{ + std::string disp = overview_description_string(); linebreak_string(disp, get_number_of_cols() - 5, get_number_of_cols() - 1); formatted_scroller(MF_EASY_EXIT | MF_ANYPRINTABLE | MF_NOSELECT, disp).show(); diff --git a/crawl-ref/source/overmap.h b/crawl-ref/source/overmap.h index 6c8faf17af..e2f6d15f11 100644 --- a/crawl-ref/source/overmap.h +++ b/crawl-ref/source/overmap.h @@ -14,5 +14,6 @@ void seen_notable_thing( int which_thing, int x, int y ); void display_overmap(); +std::string overview_description_string(); #endif |