diff options
| author | Luke Street <luke@street.dev> | 2026-02-28 21:19:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-28 20:19:17 -0800 |
| commit | 6a48380461bc9baabe1706ba57ca0cedfa2d0c51 (patch) | |
| tree | 593e054cfcb0250e63917c58b445a7e1f025a023 /src/JSystem/J2DGraph/J2DMaterialFactory.cpp | |
| parent | b5d3b8c059c10711370437f7db7539cd90f1cb29 (diff) | |
More GCC compatibility/warning fixes (#3118)
* Wrap >4-char literals in a MULTI_CHAR macro
Modern compilers do not support CW's non-standard behavior with
>4 char literals. We can, however, use a constexpr function to
compute the u64 values directly. This leaves <=4 char literals
unchanged.
* Replace non-pointer usages of NULL with 0
* Define NULL to nullptr on C++11 and above
* Fix more -Wpointer-arith and -Woverflow warnings
* Replace u32/s32 with uintptr_t/intptr_t where appropriate
* JSUOutputStream: Overload all standard int types
Diffstat (limited to 'src/JSystem/J2DGraph/J2DMaterialFactory.cpp')
| -rw-r--r-- | src/JSystem/J2DGraph/J2DMaterialFactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp index 52349f8304..156a092615 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -244,7 +244,7 @@ u16 J2DMaterialFactory::newTexNo(int param_0, int param_1) const { if (iVar2->field_0x38[param_1] != 0xffff) { return field_0x28[iVar2->field_0x38[param_1]]; } - return 0x1FFFF; + return 0xFFFF; } u16 J2DMaterialFactory::newFontNo(int param_0) const { @@ -252,7 +252,7 @@ u16 J2DMaterialFactory::newFontNo(int param_0) const { if (iVar2->field_0x48 != 0xffff) { return field_0x2c[iVar2->field_0x48]; } - return 0x1FFFF; + return 0xFFFF; } J2DTevOrder J2DMaterialFactory::newTevOrder(int param_0, int param_1) const { |