diff options
| -rw-r--r-- | crawl-ref/source/menu.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 69486881a9..b75865876b 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -2826,7 +2826,8 @@ void TextItem::render() cgotoxy(m_min_coord.x, m_min_coord.y + i); textcolor(m_fg_colour); textbackground(m_bg_colour); - cprintf("%s", m_render_text.substr(newline_pos, endline_pos).c_str()); + cprintf("%s", m_render_text.substr(newline_pos, + endline_pos - newline_pos).c_str()); if (endline_pos != string::npos) newline_pos = endline_pos + 1; else diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index b2b676b05f..42adc8d5a4 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -541,8 +541,11 @@ static void _mark_fully_random(newgame_def* ng, newgame_def* ng_choice, */ static const int COLUMN_WIDTH = 25; static const int X_MARGIN = 4; -static const int CHAR_DESC_START_Y = 17; -static const int SPECIAL_KEYS_START_Y = CHAR_DESC_START_Y + 3; +static const int CHAR_DESC_START_Y = 16; +static const int CHAR_DESC_HEIGHT = 3; +static const int SPECIAL_KEYS_START_Y = CHAR_DESC_START_Y + + CHAR_DESC_HEIGHT + 1; + static void _construct_species_menu(const newgame_def* ng, const newgame_def& defaults, MenuFreeform* menu) @@ -788,7 +791,8 @@ static void _prompt_species(newgame_def* ng, newgame_def* ng_choice, _construct_species_menu(ng, defaults, freeform); MenuDescriptor* descriptor = new MenuDescriptor(&menu); descriptor->init(coord_def(X_MARGIN, CHAR_DESC_START_Y), - coord_def(get_number_of_cols(), CHAR_DESC_START_Y + 2), + coord_def(get_number_of_cols(), CHAR_DESC_START_Y + + CHAR_DESC_HEIGHT), "descriptor"); menu.attach_object(descriptor); |