mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-09-04 01:07:56 -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:
@@ -127,7 +127,7 @@ int daLv6ChangeGate_c::Execute(Mtx** param_0) {
|
||||
|
||||
for (int i = 0; i < 12; i++) {
|
||||
cXyz spC(cyl_x_offset + mMoveTransX, 0.0f, 0.0f);
|
||||
mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z);
|
||||
mDoMtx_stack_c::ZXYrotS(0, shape_angle.y, shape_angle.z);
|
||||
mDoMtx_stack_c::multVec(&spC, &spC);
|
||||
spC += current.pos;
|
||||
|
||||
@@ -251,7 +251,7 @@ void daLv6ChangeGate_c::init_modeBreak() {
|
||||
|
||||
void daLv6ChangeGate_c::modeBreak() {
|
||||
cXyz effpos(mMoveTransX, 0.0f, 0.0f);
|
||||
mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z);
|
||||
mDoMtx_stack_c::ZXYrotS(0, shape_angle.y, shape_angle.z);
|
||||
mDoMtx_stack_c::multVec(&effpos, &effpos);
|
||||
effpos += current.pos;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user