diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-09-04 07:56:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-04 17:56:59 +0300 |
| commit | b45a089e15d79821b07be020db628e01a49b1fd2 (patch) | |
| tree | 948057548cc19b19d644bd4f300ca6434e6bff11 /include/JSystem/JUtility | |
| parent | ee8b843996f4d888903f8c125b95ec1af376877e (diff) | |
some J3D/misc cleanup (#2628)
* some j3d cleanup
* begin using uintptr_t
* j3dgraphbase cleanup
* j3dgraphanimator cleanup
Diffstat (limited to 'include/JSystem/JUtility')
| -rw-r--r-- | include/JSystem/JUtility/JUTAssert.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JUtility/JUTTexture.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 2e7b126dc0..c33f590944 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -13,7 +13,6 @@ #define JUT_ASSERT_MSG_F(LINE, COND, MSG, ...) \ (COND) ? (void)0 : (JUTAssertion::showAssert_f(JUTAssertion::getSDevice(), __FILE__, LINE, MSG, __VA_ARGS__), OSPanic(__FILE__, LINE, "Halt")); -#define J3D_ASSERT(LINE, COND, MSG) JUT_ASSERT_MSG(LINE, (COND) != 0, MSG) #define J3D_PANIC(LINE, COND, MSG) ((COND) != 0 || (OSPanic(__FILE__, LINE, MSG), 0)); #define JUT_PANIC(LINE, TEXT) \ @@ -36,7 +35,6 @@ #define JUT_ASSERT(...) (void)0; #define JUT_ASSERT_MSG(...) (void)0; #define JUT_ASSERT_MSG_F(...) (void)0; -#define J3D_ASSERT(...) (void)0; #define J3D_PANIC(...) (void)0; #define JUT_PANIC(...) #define JUT_WARN(...) diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index 606cd5811c..c42bc09b1f 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -2,6 +2,7 @@ #define JUTTEXTURE_H #include <dolphin/gx.h> +#include <stdint.h> class JUTPalette; @@ -24,7 +25,7 @@ struct ResTIMG { /* 0x08 */ u8 indexTexture; /* 0x09 */ u8 colorFormat; /* 0x0A */ u16 numColors; - /* 0x0C */ u32 paletteOffset; + /* 0x0C */ uintptr_t paletteOffset; /* 0x10 */ u8 mipmapEnabled; /* 0x11 */ u8 doEdgeLOD; /* 0x12 */ u8 biasClamp; @@ -36,7 +37,7 @@ struct ResTIMG { /* 0x18 */ u8 mipmapCount; /* 0x19 */ u8 unknown; /* 0x1A */ s16 LODBias; - /* 0x1C */ u32 imageOffset; + /* 0x1C */ uintptr_t imageOffset; }; // Size: 0x20 /** |