mirror of
https://github.com/zeldaret/tp
synced 2026-06-26 10:21:58 -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:
@@ -2540,9 +2540,9 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) {
|
||||
color_reg0.b = 0;
|
||||
|
||||
f32 size = 8000.0f;
|
||||
if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == NULL) {
|
||||
if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) {
|
||||
size = 11000.0f;
|
||||
} else if (strcmp(dComIfGp_getStartStageName(), "F_SP200") == NULL) {
|
||||
} else if (strcmp(dComIfGp_getStartStageName(), "F_SP200") == 0) {
|
||||
size = 10000.0f;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user