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_e_hp.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_e_hp.cpp')
| -rw-r--r-- | src/d/actor/d_a_e_hp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index a1f202489a..114ca27387 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -119,7 +119,7 @@ int daE_HP_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { } int daE_HP_c::JointCallBack(J3DJoint* i_joint, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daE_HP_c* poe = (daE_HP_c*)model->getUserArea(); if (poe != NULL) { @@ -155,7 +155,7 @@ int daE_HP_c::LampCtrlJoint(J3DJoint* i_joint, J3DModel* i_model) { } int daE_HP_c::LampJointCallBack(J3DJoint* i_joint, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daE_HP_c* poe = (daE_HP_c*)model->getUserArea(); if (poe != NULL) { |