diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-06-29 13:19:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-29 22:19:09 +0200 |
| commit | 046d178003035ea87d3042a61917c2d482c68c74 (patch) | |
| tree | 4240e760d8d40201ca4ec96634da8abff211f6bb /include/JSystem/J2DGraph | |
| parent | cd5b02450cf278cbeb2c8bb90be1ad22518938c7 (diff) | |
work on daalink, fop actor, mDo machine, msg_scrn, + various (#201)
* work on fop actor / actor mng, daalink, d_a_obj_item
* d_a_title mostly decompiled
* daalink / d_event / JMessage / dmsg_out_font work
* msg_scrn_base / msg_scrn_boss
* some work on mDo machine, d_menu_save, d_tresure, and various
* remove asm
* progress
Diffstat (limited to 'include/JSystem/J2DGraph')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DTextBox.h | 9 | ||||
| -rw-r--r-- | include/JSystem/J2DGraph/J2DTextBoxEx.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index c2b017c00a..ba81b38f62 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -36,7 +36,7 @@ public: /* 80300490 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding); /* 803002E8 */ virtual void draw(f32, f32); /* 80300278 */ virtual void setFont(JUTFont*); - /* 8021C7F4 */ virtual void getFont() const; + /* 8021C7F4 */ virtual JUTFont* getFont() const; /* 80254408 */ virtual bool setBlack(JUtility::TColor); /* 80186C84 */ virtual void setWhite(JUtility::TColor); /* 8019230C */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor); @@ -75,8 +75,15 @@ public: } void setFontSize(TFontSize size) { setFontSize(size.mSizeX, size.mSizeY); } + void getFontSize(TFontSize& size) const { + size.mSizeX = field_0x11c; + size.mSizeY = field_0x120; + } void setCharSpace(f32 space) { mCharSpacing = space; } + f32 getCharSpace() const { return mCharSpacing; } + void setLineSpace(f32 space) { mLineSpacing = space; } + f32 getLineSpace() const { return mLineSpacing; } private: /* 0x0100 */ JUTFont* mFont; diff --git a/include/JSystem/J2DGraph/J2DTextBoxEx.h b/include/JSystem/J2DGraph/J2DTextBoxEx.h index 38e8ff0746..d9b8a725a1 100644 --- a/include/JSystem/J2DGraph/J2DTextBoxEx.h +++ b/include/JSystem/J2DGraph/J2DTextBoxEx.h @@ -37,7 +37,7 @@ public: /* 803078AC */ virtual void draw(f32, f32); /* 80307AF0 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding); /* 80307D5C */ virtual void setFont(JUTFont*); - /* 80307DC0 */ virtual void getFont() const; + /* 80307DC0 */ virtual JUTFont* getFont() const; /* 8030823C */ virtual void setBlack(JUtility::TColor); /* 803082C4 */ virtual void setWhite(JUtility::TColor); /* 8030834C */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor); |