mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 22:44:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix misc 10 (#1208)

Browse source 
* Cleanup around `Item_DropCollectible`

* Cleanup around `Math3D_Vec3fDistSq`, `Math3D_Dist2DSq`

* Material/Model naming for one dlist pair

* Minor comments fixup

* Explicit `!= NULL` check

* Signed decimal for an array of coordinates

* Fixup comments some more
This commit is contained in:
Dragorn421 2022-04-30 14:33:28 +02:00 • committed by GitHub
parent 8ad90df27f
commit 72847660eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 50 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/code/fault.c
View file

@ -1107,7 +1107,7 @@ void Fault_DisplayFrameBuffer(void) {
osViSetSpecialFeatures(OS_VI_GAMMA_OFF | OS_VI_DITHER_FILTER_ON);
osViBlack(false);
if (sFaultInstance->fb) {
if (sFaultInstance->fb != NULL) {
fb = sFaultInstance->fb;
} else {
fb = osViGetNextFramebuffer();

10
src/code/z_collision_check.c
View file

@ -858,7 +858,7 @@ s32 Collider_DestroyQuadDim(GlobalContext* globalCtx, ColliderQuadDim* dim) {
}
s32 Collider_ResetQuadACDist(GlobalContext* globalCtx, ColliderQuadDim* dim) {
dim->acDist = 1.0E38f;
dim->acDistSq = 1.0E38f;
return true;
}
@ -959,16 +959,16 @@ s32 Collider_ResetQuadOC(GlobalContext* globalCtx, Collider* collider) {
* otherwise returns false. Used on player AT colliders to prevent multiple collisions from registering.
*/
s32 Collider_QuadSetNearestAC(GlobalContext* globalCtx, ColliderQuad* quad, Vec3f* hitPos) {
f32 acDist;
f32 acDistSq;
Vec3f dcMid;
if (!(quad->info.toucherFlags & TOUCH_NEAREST)) {
return true;
}
Math_Vec3s_ToVec3f(&dcMid, &quad->dim.dcMid);
acDist = Math3D_Vec3fDistSq(&dcMid, hitPos);
if (acDist < quad->dim.acDist) {
quad->dim.acDist = acDist;
acDistSq = Math3D_Vec3fDistSq(&dcMid, hitPos);
if (acDistSq < quad->dim.acDistSq) {
quad->dim.acDistSq = acDistSq;
if (quad->info.atHit != NULL) {
Collider_ResetACBase(globalCtx, quad->info.atHit);
}

8
src/code/z_horse.c
View file

@ -135,10 +135,10 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) {
gSaveContext.entranceIndex == 0x0292 || gSaveContext.entranceIndex == 0x0476) &&
(gSaveContext.respawnFlag == 0)) {
Vec3s spawnPositions[] = {
{ 0xF46F, 0x0139, 0x1E14 },
{ 0xF894, 0x0139, 0x1B67 },
{ 0xF035, 0x0139, 0x1B15 },
{ 0xF6F7, 0x0139, 0x1766 },
{ -2961, 313, 7700 },
{ -1900, 313, 7015 },
{ -4043, 313, 6933 },
{ -2313, 313, 5990 },
};
if (gSaveContext.entranceIndex == 0x028A) {