mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-02 22:14:33 +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

16
src/overlays/actors/ovl_En_Insect/z_en_insect.c
View file

@ -123,23 +123,23 @@ void func_80A7BF58(EnInsect* this) {
*/
s32 EnInsect_FoundNearbySoil(EnInsect* this, GlobalContext* globalCtx) {
Actor* currentActor;
f32 currentDistance;
f32 bestDistance;
f32 currentDistanceSq;
f32 bestDistanceSq;
s32 ret;
ret = 0;
currentActor = globalCtx->actorCtx.actorLists[ACTORCAT_ITEMACTION].head;
bestDistance = 6400.0f;
bestDistanceSq = 6400.0f;
this->soilActor = NULL;
while (currentActor != NULL) {
if (currentActor->id == ACTOR_OBJ_MAKEKINSUTA) {
currentDistance = Math3D_Dist2DSq(this->actor.world.pos.x, this->actor.world.pos.z,
currentActor->world.pos.x, currentActor->world.pos.z);
currentDistanceSq = Math3D_Dist2DSq(this->actor.world.pos.x, this->actor.world.pos.z,
currentActor->world.pos.x, currentActor->world.pos.z);
if (currentDistance < bestDistance && currentActor->room == this->actor.room) {
if (currentDistanceSq < bestDistanceSq && currentActor->room == this->actor.room) {
ret = 1;
bestDistance = currentDistance;
bestDistanceSq = currentDistanceSq;
this->soilActor = (ObjMakekinsuta*)currentActor;
}
}
@ -429,7 +429,7 @@ void func_80A7CC3C(EnInsect* this, GlobalContext* globalCtx) {
if (this->unk_31A <= 0) {
if ((this->unk_314 & 0x10) && this->soilActor != NULL &&
Math3D_Vec3fDistSq(&this->soilActor->actor.world.pos, &this->actor.world.pos) < 64.0f) {
Math3D_Vec3fDistSq(&this->soilActor->actor.world.pos, &this->actor.world.pos) < SQ(8.0f)) {
this->soilActor->unk_152 = 1;
}
Actor_Kill(&this->actor);