mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-07-13 19:35:41 +00:00
Build fixes for Linux, some warnings and compatibility fixes for C++17 and up
This commit is contained in:
parent
924bc058b4
commit
74ad8f7804
36 changed files with 126 additions and 225 deletions
|
@ -124,13 +124,13 @@ float BitmapText::getSetWidth()
|
|||
return textWidth;
|
||||
}
|
||||
|
||||
float BitmapText::getHeight()
|
||||
float BitmapText::getHeight() const
|
||||
{
|
||||
float sz = bmpFont->font->GetCharHeight('A') * bmpFont->scale;
|
||||
return lines.size()*sz;
|
||||
}
|
||||
|
||||
float BitmapText::getLineHeight()
|
||||
float BitmapText::getLineHeight() const
|
||||
{
|
||||
return bmpFont->font->GetCharHeight('A') * bmpFont->scale;
|
||||
}
|
||||
|
@ -349,12 +349,12 @@ bool BitmapText::isScrollingText()
|
|||
return scrolling;
|
||||
}
|
||||
|
||||
size_t BitmapText::getNumLines()
|
||||
size_t BitmapText::getNumLines() const
|
||||
{
|
||||
return lines.size();
|
||||
}
|
||||
|
||||
float BitmapText::getStringWidth(const std::string& text)
|
||||
float BitmapText::getStringWidth(const std::string& text) const
|
||||
{
|
||||
std::string tmp;
|
||||
int maxsize = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue