diff options
| author | cadmic <cadmic24@gmail.com> | 2024-01-30 16:43:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 19:43:10 -0500 |
| commit | 17da5e7bf92c890b62b8b9ab1df61fcb0b15764f (patch) | |
| tree | 31d7c98ecfad079193761d727b99c0885f4305f2 /include | |
| parent | 77c9c97ff9c1ca822e8f72575cd6a02eabc1b716 (diff) | |
z_collision_check.c OK (#1642)
* Match z_collision_check.c
* Disable function declarations
* Remove /* OOT_DEBUG */
* Remove newlines around ifdef
* Newlines
* Tweak z_actor.c #if to avoid merge conflicts
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/functions.h b/include/functions.h index fea1e252d..52873969c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -619,8 +619,10 @@ u16 WaterBox_GetBgCamSetting(CollisionContext* colCtx, WaterBox* waterBox); u32 WaterBox_GetLightIndex(CollisionContext* colCtx, WaterBox* waterBox); s32 func_80042708(CollisionPoly* polyA, CollisionPoly* polyB, Vec3f* point, Vec3f* closestPoint); s32 func_800427B4(CollisionPoly* polyA, CollisionPoly* polyB, Vec3f* pointA, Vec3f* pointB, Vec3f* closestPoint); +#if OOT_DEBUG void BgCheck_DrawDynaCollision(PlayState*, CollisionContext*); void BgCheck_DrawStaticCollision(PlayState*, CollisionContext*); +#endif void func_80043334(CollisionContext* colCtx, Actor* actor, s32 bgId); s32 DynaPolyActor_TransformCarriedActor(CollisionContext* colCtx, s32 bgId, Actor* carriedActor); void DynaPolyActor_Init(DynaPolyActor* dynaActor, s32 transformFlags); @@ -665,8 +667,10 @@ s32 func_8005B198(void); s16 Camera_SetFinishedFlag(Camera* camera); DamageTable* DamageTable_Get(s32 index); void DamageTable_Clear(DamageTable* table); +#if OOT_DEBUG void Collider_DrawRedPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC); void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC, u8 r, u8 g, u8 b); +#endif s32 Collider_InitJntSph(PlayState* play, ColliderJntSph* jntSph); s32 Collider_FreeJntSph(PlayState* play, ColliderJntSph* jntSph); s32 Collider_DestroyJntSph(PlayState* play, ColliderJntSph* jntSph); @@ -714,8 +718,10 @@ void CollisionCheck_DestroyContext(PlayState* play, CollisionCheckContext* colCh void CollisionCheck_ClearContext(PlayState* play, CollisionCheckContext* colChkCtx); void CollisionCheck_EnableSAC(PlayState* play, CollisionCheckContext* colChkCtx); void CollisionCheck_DisableSAC(PlayState* play, CollisionCheckContext* colChkCtx); +#if OOT_DEBUG void Collider_Draw(PlayState* play, Collider* col); void CollisionCheck_DrawCollision(PlayState* play, CollisionCheckContext* colChkCtx); +#endif s32 CollisionCheck_SetAT(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider); s32 CollisionCheck_SetAT_SAC(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider, s32 index); s32 CollisionCheck_SetAC(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider); |