diff options
| -rw-r--r-- | crawl-ref/docs/options_guide.txt | 6 | ||||
| -rw-r--r-- | crawl-ref/settings/init.txt | 1 | ||||
| -rw-r--r-- | crawl-ref/source/defines.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/options.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/viewgeom.cc | 3 |
6 files changed, 11 insertions, 4 deletions
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt index cca3dd80be..63671be47b 100644 --- a/crawl-ref/docs/options_guide.txt +++ b/crawl-ref/docs/options_guide.txt @@ -67,7 +67,8 @@ The contents of this text are: status_caption_colour, delay_message_clear, show_inventory_weights, show_gold_turns, show_beam, item_stack_summary_minimum, list_rotten, - mlist_min_height, msg_max_height, messages_at_top, + mlist_min_height, msg_min_height, msg_max_height, + messages_at_top, mlist_allow_alternate_layout, mlist_targetting, classic_hud, menu_colour, menu_colour_prefix_class, menu_colour_shops, message_colour, force_more_message, @@ -1324,6 +1325,9 @@ mlist_min_height = 5 before letting the message area get more. (Note that the monster list is only available for ASCII.) +msg_min_height = 6 + You can reduce this to 5 give more space to the map display. + msg_max_height = 10 If there is extra space available after the monster list has expanded, the message area will expand up to this height. diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt index bcc34aeb43..e2e9b48b39 100644 --- a/crawl-ref/settings/init.txt +++ b/crawl-ref/settings/init.txt @@ -245,6 +245,7 @@ sort_menus = inv: true : equipped, freshness, charged # status_caption_colour = yellow # classic_hud = true # mlist_min_height = 5 +# msg_min_height = 6 # msg_max_height = 10 # mlist_allow_alternate_layout = true # messages_at_top = true diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h index 77b453c56e..70cb440334 100644 --- a/crawl-ref/source/defines.h +++ b/crawl-ref/source/defines.h @@ -120,7 +120,7 @@ const int LABYRINTH_BORDER = 4; #define VIEW_BASE_WIDTH 33 // FIXME: never used #define VIEW_MIN_WIDTH ENV_SHOW_DIAMETER #define VIEW_MIN_HEIGHT ENV_SHOW_DIAMETER -#define MSG_MIN_HEIGHT 6 +#define MSG_MIN_HEIGHT 5 // max traps per level #define MAX_TRAPS 100 diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 28803b4857..be738cfb0c 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -603,6 +603,7 @@ void game_options::reset_options() view_max_width = std::max(33, VIEW_MIN_WIDTH); view_max_height = std::max(21, VIEW_MIN_HEIGHT); mlist_min_height = 5; + msg_min_height = std::max(6, MSG_MIN_HEIGHT); msg_max_height = std::max(10, MSG_MIN_HEIGHT); mlist_allow_alternate_layout = false; messages_at_top = false; @@ -2405,6 +2406,7 @@ void game_options::read_option_line(const std::string &str, bool runscript) else INT_OPTION(view_max_width, VIEW_MIN_WIDTH, GXM + 1); else INT_OPTION(view_max_height, VIEW_MIN_HEIGHT, GYM + 1); else INT_OPTION(mlist_min_height, 0, INT_MAX); + else INT_OPTION(msg_min_height, MSG_MIN_HEIGHT, INT_MAX); else INT_OPTION(msg_max_height, MSG_MIN_HEIGHT, INT_MAX); else BOOL_OPTION(mlist_allow_alternate_layout); else BOOL_OPTION(messages_at_top); diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h index 2e64f1f680..b8d331c0cf 100644 --- a/crawl-ref/source/options.h +++ b/crawl-ref/source/options.h @@ -58,6 +58,7 @@ public: int view_max_width; int view_max_height; int mlist_min_height; + int msg_min_height; int msg_max_height; bool mlist_allow_alternate_layout; bool messages_at_top; diff --git a/crawl-ref/source/viewgeom.cc b/crawl-ref/source/viewgeom.cc index 784a402bcc..7eb1db1e5e 100644 --- a/crawl-ref/source/viewgeom.cc +++ b/crawl-ref/source/viewgeom.cc @@ -18,7 +18,6 @@ // define VIEW_MAX_WIDTH use Options.view_max_width #define HUD_WIDTH 42 #define HUD_HEIGHT 12 -// #define MSG_MIN_HEIGHT defined elsewhere #define MSG_MAX_HEIGHT Options.msg_max_height #define MLIST_MIN_HEIGHT Options.mlist_min_height #define MLIST_MIN_WIDTH 25 // non-inline layout only @@ -40,7 +39,7 @@ class _layout termp(1,1), termsz(termsz_), viewp(-1,-1), viewsz(VIEW_MIN_WIDTH, VIEW_MIN_HEIGHT), hudp(-1,-1), hudsz(hudsz_), - msgp(-1,-1), msgsz(0, MSG_MIN_HEIGHT), + msgp(-1,-1), msgsz(0, Options.msg_min_height), mlistp(-1,-1), mlistsz(MLIST_MIN_WIDTH, 0), hud_gutter(HUD_MIN_GUTTER), valid(false) {} |