2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 23:07:43 +00:00

Several CWorldTransManager imps

This commit is contained in:
Jack Andersen
2016-08-16 12:49:19 -10:00
parent c1e74b6314
commit 12f23ba340
17 changed files with 634 additions and 70 deletions

View File

@@ -106,7 +106,7 @@ void CGuiTextSupport::CheckAndRebuildTextRenderBuffer()
g_TextExecuteBuf->Clear();
g_TextExecuteBuf->x18_textState.x48_enableWordWrap = x14_props.x0_wordWrap;
g_TextExecuteBuf->BeginBlock(0, 0, x34_extentX, x38_extentY, ETextDirection(x14_props.x1_vertical),
g_TextExecuteBuf->BeginBlock(0, 0, x34_extentX, x38_extentY, x14_props.xc_direction,
x14_props.x4_justification, x14_props.x8_vertJustification);
g_TextExecuteBuf->AddColor(EColorType::Main, x24_fontColor);
g_TextExecuteBuf->AddColor(EColorType::Outline, x28_outlineColor);

View File

@@ -61,14 +61,15 @@ class CGuiTextProperties
{
friend class CGuiTextSupport;
bool x0_wordWrap;
bool x1_vertical;
bool x1_multiline;
EJustification x4_justification;
EVerticalJustification x8_vertJustification;
ETextDirection xc_direction;
public:
CGuiTextProperties(bool wordWrap, bool vertical, EJustification justification,
EVerticalJustification vertJustification, ETextDirection dir)
: x0_wordWrap(wordWrap), x1_vertical(vertical), x4_justification(justification),
CGuiTextProperties(bool wordWrap, bool multiline, EJustification justification,
EVerticalJustification vertJustification,
ETextDirection dir=ETextDirection::Horizontal)
: x0_wordWrap(wordWrap), x1_multiline(multiline), x4_justification(justification),
x8_vertJustification(vertJustification), xc_direction(dir) {}
};