mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 04:48:21 -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:
@@ -113,11 +113,11 @@ int daCoachFire_c::execute() {
|
||||
dAttention_c* attn = dComIfGp_getAttention();
|
||||
if (attn->LockonTruth()) {
|
||||
if (attn->LockonTarget(0) != this) {
|
||||
if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != NULL) {
|
||||
if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != false) {
|
||||
fopAcM_delete(this);
|
||||
}
|
||||
}
|
||||
} else if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != NULL) {
|
||||
} else if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != false) {
|
||||
fopAcM_delete(this);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user