diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-07-31 13:20:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-31 13:20:48 -0400 |
| commit | 45718d8cccbde7bad1c090de82e343fba68dc27f (patch) | |
| tree | 283f733a77fb0ead544a652e17cf2dad2ad42e89 /include/JSystem/JUtility | |
| parent | 641268e340402a965c90610f7c176d95e346c644 (diff) | |
Compiler compat fix: Passing of rvalue GXColors to non-const reference parameters (#1142)
Diffstat (limited to 'include/JSystem/JUtility')
| -rw-r--r-- | include/JSystem/JUtility/JUTFont.h | 14 | ||||
| -rw-r--r-- | include/JSystem/JUtility/JUTResFont.h | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index b9e2b4f2..edd981a1 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -62,16 +62,16 @@ public: }; /* 0x0C */ virtual void setGX() = 0; - /* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2); + /* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2) { setGX(); } /* 0x14 */ virtual f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6) = 0; /* 0x18 */ virtual int getLeading() const = 0; - /* 0x1C */ virtual s32 getAscent() const = 0; - /* 0x20 */ virtual s32 getDescent() const = 0; - /* 0x24 */ virtual s32 getHeight() const = 0; - /* 0x28 */ virtual s32 getWidth() const = 0; + /* 0x1C */ virtual int getAscent() const = 0; + /* 0x20 */ virtual int getDescent() const = 0; + /* 0x24 */ virtual int getHeight() const = 0; + /* 0x28 */ virtual int getWidth() const = 0; /* 0x2C */ virtual void getWidthEntry(int i_no, TWidth* width) const = 0; - /* 0x30 */ virtual int getCellWidth() const; - /* 0x34 */ virtual s32 getCellHeight() const; + /* 0x30 */ virtual int getCellWidth() const { return getWidth(); } + /* 0x34 */ virtual int getCellHeight() const { return getHeight(); } /* 0x38 */ virtual int getFontType() const = 0; /* 0x3C */ virtual const ResFONT* getResFont() const = 0; /* 0x40 */ virtual bool isLeadByte(int a1) const = 0; diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 77047933..72a68d9e 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -17,13 +17,13 @@ public: virtual const ResFONT* getResFont() const { return mResFont; } virtual int getFontType() const { return mInfoBlock->fontType; } virtual int getLeading() const { return mInfoBlock->leading; } - virtual s32 getWidth() const { return mInfoBlock->width; } - virtual s32 getAscent() const { return mInfoBlock->ascent; } - virtual s32 getDescent() const { return mInfoBlock->descent; } - virtual s32 getHeight() const { return getAscent() + getDescent(); } + virtual int getWidth() const { return mInfoBlock->width; } + virtual int getAscent() const { return mInfoBlock->ascent; } + virtual int getDescent() const { return mInfoBlock->descent; } + virtual int getHeight() const { return getAscent() + getDescent(); } virtual void getWidthEntry(int, JUTFont::TWidth*) const; virtual int getCellWidth() const; - virtual s32 getCellHeight() const; + virtual int getCellHeight() const; virtual bool isLeadByte(int) const; virtual void loadImage(int, GXTexMapID); virtual void setBlock(); |