diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-02-20 14:31:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 08:31:31 -0500 |
| commit | e51fd737040352ab366a2bc531b60858f3b00aae (patch) | |
| tree | 041379e266d374e502979ce966ea7162af01e810 /include | |
| parent | a9526a3354d7da16051e41e0b599927a202331a2 (diff) | |
Fix misc 7 (#1149)
* Fixup `Math3D_LineClosestToPoint`
* `gDodongosCavernBossLavaFloorTex` is 32x64
* Name empty-dlist-making functions `_EmptyDList`
* Fix typos
* transitionRate -> morphFrames
* Compare `xyzDistToPlayerSq` to squared values
* Fix hookshot target/post collision header names being swapped
* Fix description of `z_bg_mizu_movebg.c`
* Add scene command comment to `func_80098508` to match other scene command handlers
* Some fixup in `Camera_Demo5`
* `1` -> `ALLOCTYPE_ABSOLUTE` in comment on `ActorContext.absoluteSpace`
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/z64.h | 2 | ||||
| -rw-r--r-- | include/z64camera.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/functions.h b/include/functions.h index 7fc36b1a4..f260cc29c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1684,7 +1684,7 @@ f32 Math_CosF(f32 angle); s32 Math3D_PlaneVsLineSegClosestPoint(f32 planeAA, f32 planeAB, f32 planeAC, f32 planeADist, f32 planeBA, f32 planeBB, f32 planeBC, f32 planeBDist, Vec3f* linePointA, Vec3f* linePointB, Vec3f* closestPoint); -void Math3D_LineClosestToPoint(Linef* line, Vec3f* pos, Vec3f* closestPoint); +void Math3D_LineClosestToPoint(InfiniteLine* line, Vec3f* pos, Vec3f* closestPoint); s32 Math3D_PlaneVsPlaneVsLineClosestPoint(f32 planeAA, f32 planeAB, f32 planeAC, f32 planeADist, f32 planeBA, f32 planeBB, f32 planeBC, f32 planeBDist, Vec3f* point, Vec3f* closestPoint); void Math3D_LineSplitRatio(Vec3f* v0, Vec3f* v1, f32 ratio, Vec3f* ret); diff --git a/include/z64.h b/include/z64.h index a96b3becc..0c07a192b 100644 --- a/include/z64.h +++ b/include/z64.h @@ -263,7 +263,7 @@ typedef struct { } flags; /* 0x0128 */ TitleCardContext titleCtx; /* 0x0138 */ char unk_138[0x04]; - /* 0x013C */ void* absoluteSpace; // Space used to allocate actor overlays of alloc type 1 + /* 0x013C */ void* absoluteSpace; // Space used to allocate actor overlays with alloc type ALLOCTYPE_ABSOLUTE } ActorContext; // size = 0x140 typedef struct { diff --git a/include/z64camera.h b/include/z64camera.h index 8bfd447da..86f96579a 100644 --- a/include/z64camera.h +++ b/include/z64camera.h @@ -789,7 +789,7 @@ typedef struct { { flags, CAM_DATA_FLAGS } typedef struct { - /* 0x00 */ Linef unk_00; + /* 0x00 */ InfiniteLine unk_00; /* 0x18 */ f32 unk_18; /* 0x1C */ f32 unk_1C; /* 0x20 */ f32 unk_20; @@ -913,7 +913,7 @@ typedef struct { typedef struct { /* 0x00 */ Vec3f initalPos; /* 0x0C */ s16 animTimer; - /* 0x10 */ Linef sceneCamPosPlayerLine; + /* 0x10 */ InfiniteLine sceneCamPosPlayerLine; } Unique0Anim; // size = 0x28 typedef struct { |