diff options
| author | cadmic <cadmic24@gmail.com> | 2024-01-30 10:54:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 13:54:38 -0500 |
| commit | 9816f62129b26b5d1068e2fa2ea887ad3fdcfd88 (patch) | |
| tree | cd6390c2cf4f3c08cec43aa1ce4022a0aecd3296 /include | |
| parent | 6d09437c2162a156a843f3f10b1f864437eee6ed (diff) | |
Define OOT_DEBUG=0 in retail builds (#1658)
* Define OOT_DEBUG=0 in retail builds
* Fix ifndef
* Replace VI_MODE_EDITOR_INACTIVE
* Revert "Replace VI_MODE_EDITOR_INACTIVE"
This reverts commit f7c4cae7c3b3d9fdc56e97183690c05f2dcec215.
* Replace VI_MODE_EDITOR_INACTIVE, take 2
* Revert EnBom_Draw
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rw-r--r-- | include/macros.h | 6 | ||||
| -rw-r--r-- | include/ultra64/gbi.h | 2 | ||||
| -rw-r--r-- | include/z64actor.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/functions.h b/include/functions.h index 946fa16df..afe206318 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1310,7 +1310,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g void GameState_Destroy(GameState* gameState); GameStateFunc GameState_GetInit(GameState* gameState); u32 GameState_IsRunning(GameState* gameState); -#ifdef OOT_DEBUG +#if OOT_DEBUG void* GameState_Alloc(GameState* gameState, size_t size, char* file, s32 line); #endif void func_800C55D0(GameAlloc* this); @@ -1434,7 +1434,7 @@ void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode); void Matrix_TranslateRotateZYX(Vec3f* translation, Vec3s* rotation); void Matrix_SetTranslateRotateYXZ(f32 translateX, f32 translateY, f32 translateZ, Vec3s* rot); Mtx* Matrix_MtxFToMtx(MtxF* src, Mtx* dest); -#ifdef OOT_DEBUG +#if OOT_DEBUG Mtx* Matrix_ToMtx(Mtx* dest, char* file, s32 line); Mtx* Matrix_NewMtx(GraphicsContext* gfxCtx, char* file, s32 line); #else diff --git a/include/macros.h b/include/macros.h index 53b597b4c..937ccb510 100644 --- a/include/macros.h +++ b/include/macros.h @@ -100,7 +100,7 @@ #define CHECK_FLAG_ALL(flags, mask) (((flags) & (mask)) == (mask)) -#ifdef OOT_DEBUG +#if OOT_DEBUG #define PRINTF osSyncPrintf #else #ifdef __sgi /* IDO compiler */ @@ -114,7 +114,7 @@ #endif #endif -#ifdef OOT_DEBUG +#if OOT_DEBUG #define LOG(exp, value, format, file, line) \ do { \ @@ -159,7 +159,7 @@ extern struct GraphicsContext* __gfxCtx; #define POLY_XLU_DISP __gfxCtx->polyXlu.p #define OVERLAY_DISP __gfxCtx->overlay.p -#ifdef OOT_DEBUG +#if OOT_DEBUG // __gfxCtx shouldn't be used directly. // Use the DISP macros defined above when writing to display buffers. diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h index 51adc6b7f..a38d85f03 100644 --- a/include/ultra64/gbi.h +++ b/include/ultra64/gbi.h @@ -5123,7 +5123,7 @@ _DW({ \ #define gDPNoOpTag(pkt, tag) gDPParam(pkt, G_NOOP, tag) #define gsDPNoOpTag(tag) gsDPParam( G_NOOP, tag) -#ifdef OOT_DEBUG +#if OOT_DEBUG #define gDPNoOpHere(pkt, file, line) gDma1p(pkt, G_NOOP, file, line, 1) #define gDPNoOpString(pkt, data, n) gDma1p(pkt, G_NOOP, data, n, 2) diff --git a/include/z64actor.h b/include/z64actor.h index 779fcad84..66a2ec303 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -305,7 +305,7 @@ typedef struct Actor { /* 0x130 */ ActorFunc update; // Update Routine. Called by `Actor_UpdateAll` /* 0x134 */ ActorFunc draw; // Draw Routine. Called by `Actor_Draw` /* 0x138 */ ActorOverlay* overlayEntry; // Pointer to the overlay table entry for this actor -#ifdef OOT_DEBUG +#if OOT_DEBUG /* 0x13C */ char dbgPad[0x10]; #endif } Actor; // size = 0x14C |