diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-28 16:11:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-28 13:11:07 -0700 |
| commit | 9eea9289b1c4316d5856d1cb9602ee463d7de989 (patch) | |
| tree | dde3385855941d12a306de3ca8fb316338be288b /src/JSystem/JMessage/control.cpp | |
| parent | c9a710a939c7bccee7eb16e90ed70c9d3f6c78ad (diff) | |
Fix JUT_ASSERT and several other macros (#2711)
* Fix JUT_ASSERT to be a nested define
* Switch names that appear in asserts to be constants instead of defines
* Replace `0` in asserts with `NULL` or `FALSE`
* Fix fpclassify
* Fix ARRAY_SIZE
* Use G_CM3D_F_INF
* More fixes for fpclassify
* Remove FLOAT_LABEL
* Remove incorrect FLAG_ON macro
* Remove UNK_BSS macro
* Silence clangd unused header warning for PCH
Diffstat (limited to 'src/JSystem/JMessage/control.cpp')
| -rw-r--r-- | src/JSystem/JMessage/control.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/JSystem/JMessage/control.cpp b/src/JSystem/JMessage/control.cpp index 5df6892a9f..d549fb5de5 100644 --- a/src/JSystem/JMessage/control.cpp +++ b/src/JSystem/JMessage/control.cpp @@ -67,14 +67,14 @@ void JMessage::TControl::render() { /* 802A77E8-802A78F4 2A2128 010C+00 0/0 1/1 0/0 .text setMessageCode__Q28JMessage8TControlFUsUs */ int JMessage::TControl::setMessageCode(u16 u16GroupID, u16 u16Index) { TProcessor* pProcessor = getProcessor(); - JUT_ASSERT(120, pProcessor!=0); + JUT_ASSERT(120, pProcessor!=NULL); return setMessageCode_inReset_(pProcessor, u16GroupID, u16Index); } /* 802A78F4-802A7A20 2A2234 012C+00 0/0 6/6 0/0 .text setMessageID__Q28JMessage8TControlFUlUlPb */ int JMessage::TControl::setMessageID(u32 uMsgID, u32 param_1, bool* pbValid) { TProcessor* pProcessor = getProcessor(); - JUT_ASSERT(132, pProcessor!=0); + JUT_ASSERT(132, pProcessor!=NULL); u32 uCode = pProcessor->toMessageCode_messageID(uMsgID, param_1, pbValid); if (uCode == 0xFFFFFFFF) { @@ -96,7 +96,7 @@ bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const* uMessageID_ = u16Index; pResourceCache_ = pProcessor->getResourceCache(); - JUT_ASSERT(155, pResourceCache_!=0); + JUT_ASSERT(155, pResourceCache_!=NULL); pMessageText_begin_ = pResourceCache_->getMessageText_messageEntry(pEntry_); pMessageText_current_ = pMessageText_begin_; |