mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-26 10:21:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

More GCC compatibility/warning fixes (#3118)

Browse Source 
* 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:
Luke Street
2026-02-28 21:19:17 -07:00
committed by GitHub
parent b5d3b8c059
commit 6a48380461
169 changed files with 1849 additions and 1818 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_meter_haihai.cpp
+8 -8
View File
@@ -30,7 +30,7 @@ int dMeterHaihai_c::_create() {
JUT_ASSERT(0, fg != false);
dPaneClass_showNullPane(mpHaihaiScreen);
mpParent = new CPaneMgr(mpHaihaiScreen, 'n_all', 2, NULL);
mpParent = new CPaneMgr(mpHaihaiScreen, MULTI_CHAR('n_all'), 2, NULL);
JUT_ASSERT(0, mpParent != NULL);
OSInitFastCast();
@@ -300,9 +300,9 @@ void dMeterHaihai_c::playBckAnime(J2DAnmTransformKey* i_bck) {
}
i_bck->setFrame(mBckFrame);
mpHaihaiScreen->search('n_anim')->setAnimation(i_bck);
mpHaihaiScreen->search('n_anim')->animationTransform();
mpHaihaiScreen->search('n_anim')->setAnimation((J2DAnmTransform*)NULL);
mpHaihaiScreen->search(MULTI_CHAR('n_anim'))->setAnimation(i_bck);
mpHaihaiScreen->search(MULTI_CHAR('n_anim'))->animationTransform();
mpHaihaiScreen->search(MULTI_CHAR('n_anim'))->setAnimation((J2DAnmTransform*)NULL);
}
}
@@ -323,8 +323,8 @@ void dMeterHaihai_c::playBtkAnime(J2DAnmTextureSRTKey* i_btk) {
}
i_btk->setFrame(mBtkFrame);
mpHaihaiScreen->search('yaji00')->setAnimation(i_btk);
mpHaihaiScreen->search('yaji01')->setAnimation(i_btk);
mpHaihaiScreen->search(MULTI_CHAR('yaji00'))->setAnimation(i_btk);
mpHaihaiScreen->search(MULTI_CHAR('yaji01'))->setAnimation(i_btk);
}
}
@@ -345,7 +345,7 @@ void dMeterHaihai_c::playBpkAnime(J2DAnmColor* i_bpk) {
}
i_bpk->setFrame(mBpkFrame);
mpHaihaiScreen->search('npc_l1')->setAnimation(i_bpk);
mpHaihaiScreen->search('yaji_l')->setAnimation(i_bpk);
mpHaihaiScreen->search(MULTI_CHAR('npc_l1'))->setAnimation(i_bpk);
mpHaihaiScreen->search(MULTI_CHAR('yaji_l'))->setAnimation(i_bpk);
}
}