summaryrefslogtreecommitdiff
path: root/src/d/d_s_play.cpp
diff options
context:
space:
mode:
authorLuke Street <luke@street.dev>2026-02-28 21:19:17 -0700
committerGitHub <noreply@github.com>2026-02-28 20:19:17 -0800
commit6a48380461bc9baabe1706ba57ca0cedfa2d0c51 (patch)
tree593e054cfcb0250e63917c58b445a7e1f025a023 /src/d/d_s_play.cpp
parentb5d3b8c059c10711370437f7db7539cd90f1cb29 (diff)
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
Diffstat (limited to 'src/d/d_s_play.cpp')
-rw-r--r--src/d/d_s_play.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp
index 69512ffea2..1e4636c457 100644
--- a/src/d/d_s_play.cpp
+++ b/src/d/d_s_play.cpp
@@ -554,7 +554,7 @@ static int phase_3(dScnPly_c* i_this) {
return cPhs_INIT_e;
}
- if (!i_this->field_0x1d0 == NULL && !i_this->field_0x1d0->sync()) {
+ if (i_this->field_0x1d0 != NULL && !i_this->field_0x1d0->sync()) {
return cPhs_INIT_e;
}