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/d/actor/d_a_door_shutter.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/d/actor/d_a_door_shutter.cpp')
| -rw-r--r-- | src/d/actor/d_a_door_shutter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 60bde824e6..59ef62eea2 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -306,7 +306,7 @@ int daDoor20_c::checkOpenMsgDoor(int* param_1) { *param_1 = 0; return 1; } - field_0x624.init(NULL, msgNo, NULL, NULL); + field_0x624.init(0, msgNo, NULL, NULL); int rv = field_0x624.checkOpenDoor(this, param_1); dMsgObject_endFlowGroup(); return rv; @@ -1380,7 +1380,7 @@ int daDoor20_c::createKey() { } field_0x5ec = fopAcM_createChildFromOffset(PROC_Obj_Lv5Key, fopAcM_GetID(this), 0xffffffff, - &cStack_28, roomNo, &cStack_30, &scale, 0xffffffff, 0); + &cStack_28, roomNo, &cStack_30, &scale, -1, 0); break; default: OSReport_Error("シャッタードア:鍵タイプが不明です\n"); // Shutter door: key type unknown @@ -1399,7 +1399,7 @@ int daDoor20_c::createKey() { } field_0x5ec = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff, - &cStack_28, roomNo, &cStack_30, &scale, 0xffffffff, 0); + &cStack_28, roomNo, &cStack_30, &scale, -1, 0); } current.pos = prevPos; |
