mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-19 13:03:33 -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:
@@ -362,7 +362,7 @@ int daNpcChin_c::CreateHeap() {
|
||||
|
||||
setMotionAnm(motionAnmParam, 0.0f);
|
||||
|
||||
if (field_0xe24 != 0 && mSpotLight.loadModel() == NULL) {
|
||||
if (field_0xe24 != 0 && mSpotLight.loadModel() == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -439,7 +439,7 @@ int daNpcChin_c::createHeapCallBack(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
int daNpcChin_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
|
||||
if (param_1 == NULL) {
|
||||
if (param_1 == 0) {
|
||||
J3DModel* model = j3dSys.getModel();
|
||||
daNpcChin_c* chin = (daNpcChin_c*)model->getUserArea();
|
||||
if (chin != NULL) {
|
||||
|
||||
Reference in New Issue
Block a user