mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 04:48:21 -04:00
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
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
// This TU seems to disable inlining entirely, as there are several weak functions that get inlined
|
||||
// in other TUs, but not here.
|
||||
@@ -3545,7 +3545,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) {
|
||||
|
||||
if (!daMP_THPPlayerOpen(moviePath, 0)) {
|
||||
OSReport("Fail to open the thp file\n");
|
||||
JUT_ASSERT(0, 0);
|
||||
JUT_ASSERT(0, FALSE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -3564,7 +3564,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) {
|
||||
daMP_buffer = mDoExt_getArchiveHeap()->alloc(daMP_THPPlayerCalcNeedMemory(), 0x20);
|
||||
if (daMP_buffer == NULL) {
|
||||
OSReport("Can't allocate the memory");
|
||||
JUT_ASSERT(0, 0);
|
||||
JUT_ASSERT(0, FALSE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -3572,7 +3572,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) {
|
||||
|
||||
if (!daMP_THPPlayerPrepare(0, 0, daMP_audioInfo.field_0xc != 1 ? OSGetTick() % daMP_audioInfo.field_0xc : 0)) {
|
||||
OSReport("Fail to prepare\n");
|
||||
JUT_ASSERT(0, 0);
|
||||
JUT_ASSERT(0, FALSE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -3653,7 +3653,7 @@ int daMP_c::daMP_c_Get_arg_movieNo() {
|
||||
|
||||
/* 80878C28-80878D10 006548 00E8+00 1/1 0/0 0/0 .text daMP_c_Init__6daMP_cFv */
|
||||
int daMP_c::daMP_c_Init() {
|
||||
JUT_ASSERT(9469, m_myObj == 0);
|
||||
JUT_ASSERT(9469, m_myObj == NULL);
|
||||
|
||||
mDoGph_gInf_c::setFrameRate(1);
|
||||
daMP_Fail_alloc = FALSE;
|
||||
|
||||
Reference in New Issue
Block a user