diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2023-10-27 15:06:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-27 16:06:44 +0200 |
| commit | 3475651701f991b636a74e0254ef1b9682fa1126 (patch) | |
| tree | d6461594333179785b5b558688dec5b4b3901472 /src/code/z_actor.c | |
| parent | 4e55168eaa4562ab131ea314a5fe4c22b591d827 (diff) | |
libc cleanup (#1568)
* libc cleanup
* Suggested changes, small alloca tweak
* Remove printf include
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index bfae518bc..fcb6387d5 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -810,7 +810,7 @@ void Actor_Init(Actor* actor, PlayState* play) { Actor_SetScale(actor, 0.01f); actor->targetMode = 3; actor->minVelocityY = -20.0f; - actor->xyzDistToPlayerSq = FLT_MAX; + actor->xyzDistToPlayerSq = MAXFLOAT; actor->naviEnemyId = NAVI_ENEMY_NONE; actor->uncullZoneForward = 1000.0f; actor->uncullZoneScale = 350.0f; @@ -1468,7 +1468,7 @@ f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2) { if (player->unk_664 != NULL) { if ((yawTempAbs > 0x4000) || (actor->flags & ACTOR_FLAG_27)) { - return FLT_MAX; + return MAXFLOAT; } else { f32 ret = actor->xyzDistToPlayerSq - actor->xyzDistToPlayerSq * 0.8f * ((0x4000 - yawTempAbs) * (1.0f / 0x8000)); @@ -1478,7 +1478,7 @@ f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2) { } if (yawTempAbs > 0x2AAA) { - return FLT_MAX; + return MAXFLOAT; } return actor->xyzDistToPlayerSq; @@ -1513,7 +1513,7 @@ s32 func_8002F0C8(Actor* actor, Player* player, s32 flag) { f32 dist; if ((player->unk_664 == NULL) && (abs_var > 0x2AAA)) { - dist = FLT_MAX; + dist = MAXFLOAT; } else { dist = actor->xyzDistToPlayerSq; } @@ -3067,7 +3067,7 @@ Actor* func_80032AF0(PlayState* play, ActorContext* actorCtx, Actor** actorPtr, u8* entry; D_8015BBE8 = D_8015BBEC = NULL; - D_8015BBF0 = sbgmEnemyDistSq = FLT_MAX; + D_8015BBF0 = sbgmEnemyDistSq = MAXFLOAT; D_8015BBF8 = 0x7FFFFFFF; if (!Player_InCsMode(play)) { |