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

New code style refactor

Browse Source
This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Runtime/GuiSys/CSaveableState.hpp
View File

@@ -5,41 +5,38 @@
#include "CToken.hpp"
#include "zeus/CColor.hpp"
namespace urde
{
namespace urde {
class CRasterFont;
class CSaveableState
{
friend class CTextExecuteBuffer;
friend class CColorOverrideInstruction;
friend class CFontInstruction;
friend class CLineExtraSpaceInstruction;
friend class CTextInstruction;
friend class CLineSpacingInstruction;
friend class CRemoveColorOverrideInstruction;
friend class CWordInstruction;
friend class CGuiTextSupport;
class CSaveableState {
friend class CTextExecuteBuffer;
friend class CColorOverrideInstruction;
friend class CFontInstruction;
friend class CLineExtraSpaceInstruction;
friend class CTextInstruction;
friend class CLineSpacingInstruction;
friend class CRemoveColorOverrideInstruction;
friend class CWordInstruction;
friend class CGuiTextSupport;
protected:
CDrawStringOptions x0_drawStrOpts;
TLockedToken<CRasterFont> x48_font;
std::vector<CTextColor> x54_colors;
std::vector<bool> x64_colorOverrides;
float x74_lineSpacing = 1.f;
s32 x78_extraLineSpace = 0;
bool x7c_enableWordWrap = false;
EJustification x80_just = EJustification::Left;
EVerticalJustification x84_vjust = EVerticalJustification::Top;
CDrawStringOptions x0_drawStrOpts;
TLockedToken<CRasterFont> x48_font;
std::vector<CTextColor> x54_colors;
std::vector<bool> x64_colorOverrides;
float x74_lineSpacing = 1.f;
s32 x78_extraLineSpace = 0;
bool x7c_enableWordWrap = false;
EJustification x80_just = EJustification::Left;
EVerticalJustification x84_vjust = EVerticalJustification::Top;
public:
CSaveableState()
{
x54_colors.resize(3, zeus::CColor::skBlack);
x64_colorOverrides.resize(16);
}
CSaveableState() {
x54_colors.resize(3, zeus::CColor::skBlack);
x64_colorOverrides.resize(16);
}
bool IsFinishedLoading() const;
bool IsFinishedLoading() const;
};
}
} // namespace urde