mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-17 22:12:43 -04:00
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
This commit is contained in:
@@ -3127,7 +3127,7 @@ bool dCamera_c::useItem1EvCamera() {
|
||||
|
||||
if (item_p->field_0x20 < item_p->field_0x4) break;
|
||||
|
||||
if (data_list[item_p->mType][1].field_0x08 != NULL && item_p->field_0x1c == 0) {
|
||||
if (data_list[item_p->mType][1].field_0x08 != 0 && item_p->field_0x1c == 0) {
|
||||
item_p->field_0x1c = 1;
|
||||
item_p->field_0x0 = 1;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user