From bfc681d4862906d1e4be5dfe1f7b2eeb44fbeeaa Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 11 Oct 2023 23:36:00 -0700 Subject: some J2DWindow matches --- include/JSystem/J2DGraph/J2DWindow.h | 5 ++++- include/JSystem/JUtility/JUTTexture.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'include/JSystem') diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h index c51110fc..11c92c8b 100644 --- a/include/JSystem/J2DGraph/J2DWindow.h +++ b/include/JSystem/J2DGraph/J2DWindow.h @@ -33,7 +33,10 @@ public: /* 0x0DC */ JUTTexture * mpContentsTexture; /* 0x0E0 */ JGeometry::TBox2 mWindowBox; /* 0x0F0 */ JUTPalette * mpPalette; - /* 0x0F4 */ JUtility::TColor mColor[4]; + /* 0x0F4 */ JUtility::TColor mColorTL; + /* 0x0F8 */ JUtility::TColor mColorTR; + /* 0x0FC */ JUtility::TColor mColorBL; + /* 0x100 */ JUtility::TColor mColorBR; /* 0x104 */ JUtility::TColor mFrameColor[2]; /* 0x10C */ s16 mTextureWidth; /* 0x10E */ s16 mTextureHeight; diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index b118139a..cce7e952 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -61,7 +61,7 @@ public: const ResTIMG* getTexInfo() const { return mTexInfo; } u8 getFormat() const { return mTexInfo->format; } - s32 getTransparency() { return mTexInfo->alphaEnabled; } + s32 getTransparency() const { return mTexInfo->alphaEnabled; } s32 getWidth() const { return mTexInfo->width; } s32 getHeight() const { return mTexInfo->height; } void setCaptureFlag(bool flag) { mFlags &= 2 | flag; } -- cgit v1.2.3