mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-16 20:27:36 -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:
@@ -448,8 +448,8 @@ BOOL daNpc_grM_c::evtProc() {
|
||||
int face_motion, motion;
|
||||
if (ctrlMsgAnm(&face_motion, &motion, this, field_0xe2d)) {
|
||||
if (field_0xe26) {
|
||||
mFaceMotionSeqMngr.setNo(face_motion, -1.0f, TRUE, NULL);
|
||||
mMotionSeqMngr.setNo(motion, -1.0f, TRUE, NULL);
|
||||
mFaceMotionSeqMngr.setNo(face_motion, -1.0f, TRUE, 0);
|
||||
mMotionSeqMngr.setNo(motion, -1.0f, TRUE, 0);
|
||||
}
|
||||
} else if (tmp != 0 && field_0xe26) {
|
||||
setAfterTalkMotion();
|
||||
|
||||
Reference in New Issue
Block a user