AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 02:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Work on CSaveUI and CSfxManager

Browse Source
This commit is contained in:
Jack Andersen
2016-12-28 19:53:00 -10:00
parent e05d69376e
commit b3cae0d4d5
17 changed files with 489 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Runtime/GuiSys/CGuiTextSupport.cpp
View File

@@ -22,13 +22,13 @@ CGuiTextSupport::CGuiTextSupport(ResId fontId, const CGuiTextProperties& props,
CTextRenderBuffer* CGuiTextSupport::GetCurrentLineRenderBuffer() const
{
if (x60_renderBuf && !x308_multilineFlag)
if (x60_renderBuf && !x308_multipageFlag)
return const_cast<CTextRenderBuffer*>(&*x60_renderBuf);
if (!x308_multilineFlag || x300_ <= x304_lineCounter)
if (!x308_multipageFlag || x300_ <= x304_pageCounter)
return nullptr;
int idx = 0;
for (const CTextRenderBuffer& buf : x2f0_lineRenderBufs)
if (idx++ == x304_lineCounter)
for (const CTextRenderBuffer& buf : x2f0_pageRenderBufs)
if (idx++ == x304_pageCounter)
return const_cast<CTextRenderBuffer*>(&buf);
return nullptr;
}
@@ -192,7 +192,7 @@ void CGuiTextSupport::AddText(const std::wstring& str)
ClearRenderBuffer();
}
void CGuiTextSupport::SetText(const std::wstring& str, bool multiline)
void CGuiTextSupport::SetText(const std::wstring& str, bool multipage)
{
if (x0_string.compare(str))
{
@@ -200,14 +200,14 @@ void CGuiTextSupport::SetText(const std::wstring& str, bool multiline)
x3c_curTime = 0.f;
x0_string = str;
ClearRenderBuffer();
x308_multilineFlag = multiline;
x304_lineCounter = 0;
x308_multipageFlag = multipage;
x304_pageCounter = 0;
}
}
void CGuiTextSupport::SetText(const std::string& str, bool multiline)
void CGuiTextSupport::SetText(const std::string& str, bool multipage)
{
SetText(hecl::UTF8ToWide(str), multiline);
SetText(hecl::UTF8ToWide(str), multipage);
}
bool CGuiTextSupport::GetIsTextSupportFinishedLoading() const