mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-01-30 01:48:15 +03:00
Make wordwrapping functions take font arguments
They need to know how wide the text is going to be in a particular font, so font::string_wordwrap and font::string_wordwrap_balanced now take a flags argument like all the printing and dimensions-getting functions. next_wrap and next_wrap_s take a Font* now, they're internal to Font.cpp so they can take a Font and avoid double flag-parsing. But if any non-Font.cpp code needs next_wrap/next_wrap_s in the future, I'd just make a public wrapper that takes a uint32_t flags and passes the Font* to the internal functions.
This commit is contained in:
committed by
Misa Elizabeth Kai
parent
0eaceed0a2
commit
25feb9dbb5
@@ -673,7 +673,7 @@ void Game::crewmate_textbox(const int r, const int g, const int b)
|
||||
/* This is a special case for wrapping, we MUST have two lines.
|
||||
* So just make sure it can't fit in one line. */
|
||||
const char* text = loc::gettext("You have rescued a crew member!");
|
||||
std::string wrapped = font::string_wordwrap_balanced(text, font::len(PR_FONT_INTERFACE, text)-1);
|
||||
std::string wrapped = font::string_wordwrap_balanced(PR_FONT_INTERFACE, text, font::len(PR_FONT_INTERFACE, text)-1);
|
||||
|
||||
size_t startline = 0;
|
||||
size_t newline;
|
||||
|
||||
Reference in New Issue
Block a user