AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 23:07:42 +00:00
Code Issues Projects Releases Wiki Activity

More CAutoMapper fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-11-17 17:35:37 -10:00
parent d14763ca19
commit a2c79eb996
17 changed files with 68 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/GuiSys/CTextExecuteBuffer.cpp
View File

@@ -390,7 +390,8 @@ void CTextExecuteBuffer::AddImage(const CFontImageDef& image)
int width = tex->GetWidth() * image.x14_cropFactor.x;
int height = tex->GetHeight() * image.x14_cropFactor.y;
if (xa4_curLine->x8_curX + width > xa0_curBlock->xc_blockExtentX && xa4_curLine->x4_wordCount > 0)
if (x18_textState.x7c_enableWordWrap &&
xa4_curLine->x8_curX + width > xa0_curBlock->xc_blockExtentX && xa4_curLine->x4_wordCount > 1)
StartNewLine();
xa4_curLine->TestLargestImage(width, height, image.CalculateBaseline());