mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-16 13:59:39 -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:
@@ -25,23 +25,23 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() {
|
||||
mpBpk->searchUpdateMaterialID(mpScreen);
|
||||
mBpkFrame = 0.0f;
|
||||
|
||||
mpParent_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL);
|
||||
mpParent_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL);
|
||||
JUT_ASSERT(0, mpParent_c != NULL);
|
||||
|
||||
mpArw_c = new CPaneMgr(mpScreen, 'ya_next', 0, NULL);
|
||||
mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('ya_next'), 0, NULL);
|
||||
JUT_ASSERT(0, mpArw_c != NULL);
|
||||
|
||||
mpArw_c->hide();
|
||||
mpArw_c->mPane->setAnimation(mpBck);
|
||||
mpScreen->search('yajnext')->setAnimation(mpBpk);
|
||||
mpScreen->search('yajinexl')->setAnimation(mpBpk);
|
||||
mpScreen->search(MULTI_CHAR('yajnext'))->setAnimation(mpBpk);
|
||||
mpScreen->search(MULTI_CHAR('yajinexl'))->setAnimation(mpBpk);
|
||||
|
||||
mpDot_c = new CPaneMgr(mpScreen, 'ya_end', 0, NULL);
|
||||
mpDot_c = new CPaneMgr(mpScreen, MULTI_CHAR('ya_end'), 0, NULL);
|
||||
JUT_ASSERT(0, mpDot_c != NULL);
|
||||
|
||||
mpDot_c->hide();
|
||||
mpScreen->search('yaj_end')->setAnimation(mpBpk);
|
||||
mpScreen->search('yajiendl')->setAnimation(mpBpk);
|
||||
mpScreen->search(MULTI_CHAR('yaj_end'))->setAnimation(mpBpk);
|
||||
mpScreen->search(MULTI_CHAR('yajiendl'))->setAnimation(mpBpk);
|
||||
}
|
||||
|
||||
dMsgScrnArrow_c::~dMsgScrnArrow_c() {
|
||||
|
||||
Reference in New Issue
Block a user