diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2024-06-25 15:13:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-25 15:13:31 -0400 |
| commit | d8f2e9abc67163a366fa2e62ac5d2d7467dfdb65 (patch) | |
| tree | 12af46e3178cf5f7fa7836e6e213f57f12b7aeaf /src/code/z_collision_check.c | |
| parent | 2ce4742bf69faebb16ea1710c4d4e7902b1be0f1 (diff) | |
Move `PlayState` to a new `z64play.h` (#1966)
* ActorContext
* frameadvance
* SfxSource
* GameOverContext
* RoomContext
* TransitionActorContext
* fix bss
* Move PlayState
* Move play functions to new header
* SAC_ENABLE
* no longer needed
* SAC_ENABLE again
* z_demo being silly
* comment
* format headers
* fix retail bss
* actually fix bss
* Cutscene_ProcessScript comment
* bss again
* Update src/code/z_demo.c
Co-authored-by: cadmic <cadmic24@gmail.com>
* rename to frame_advance and remove it from z64.h
* move macros too
* review
* Rename SequenceContext to SceneSequences
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
Diffstat (limited to 'src/code/z_collision_check.c')
| -rw-r--r-- | src/code/z_collision_check.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index bebcac08d..9b0e03131 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -1,5 +1,8 @@ #include "global.h" #include "terminal.h" + +#include "z64frame_advance.h" + #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" typedef s32 (*ColChkResetFunc)(PlayState*, Collider*); @@ -7,6 +10,8 @@ typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*); typedef void (*ColChkVsFunc)(PlayState*, CollisionCheckContext*, Collider*, Collider*); typedef s32 (*ColChkLineFunc)(PlayState*, CollisionCheckContext*, Collider*, Vec3f*, Vec3f*); +#define SAC_ENABLE (1 << 0) + // For retail BSS ordering, the block number of sparkInit in CollisionCheck_BlueBlood // must be between 183 and 255 inclusive. #pragma increment_block_number 50 @@ -2358,10 +2363,6 @@ void CollisionCheck_ATTrisVsACTris(PlayState* play, CollisionCheckContext* colCh } } -#if OOT_DEBUG -static s8 sBssDummy7; -#endif - void CollisionCheck_ATTrisVsACQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* atCol, Collider* acCol) { static Vec3f hitPos; |