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

Document Target_Draw [Target Docs 2/?] (#2115)

Browse source 
* document Target_Draw

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* fix missed renames

* retail fix

* another fix

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
fig02 2024-09-01 16:02:13 -04:00 • committed by GitHub
parent a21a59c4b5
commit 2b25c31588
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 98 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -3480,7 +3480,7 @@ void Player_UpdateShapeYaw(Player* this, PlayState* play) {
Actor* unk_664 = this->unk_664;
if ((unk_664 != NULL) &&
((play->actorCtx.targetCtx.unk_4B != 0) || (this->actor.category != ACTORCAT_PLAYER))) {
((play->actorCtx.targetCtx.reticleSpinCounter != 0) || (this->actor.category != ACTORCAT_PLAYER))) {
Math_ScaledStepToS(&this->actor.shape.rot.y, Math_Vec3f_Yaw(&this->actor.world.pos, &unk_664->focus.pos),
4000);
} else if ((this->stateFlags1 & PLAYER_STATE1_17) &&
@ -3588,7 +3588,7 @@ void func_80836BEC(Player* this, PlayState* play) {
if ((actorToTarget != NULL) && !(actorToTarget->flags & ACTOR_FLAG_27)) {
if ((actorToTarget == this->unk_664) && (this->actor.category == ACTORCAT_PLAYER)) {
actorToTarget = play->actorCtx.targetCtx.unk_94;
actorToTarget = play->actorCtx.targetCtx.arrowHoverActor;
}
if (actorToTarget != this->unk_664) {
@ -3749,7 +3749,7 @@ s32 Player_GetMovementSpeedAndYaw(Player* this, f32* outSpeedTarget, s16* outYaw
*outYawTarget = this->actor.shape.rot.y;
if (this->unk_664 != NULL) {
if ((play->actorCtx.targetCtx.unk_4B != 0) && !(this->stateFlags2 & PLAYER_STATE2_6)) {
if ((play->actorCtx.targetCtx.reticleSpinCounter != 0) && !(this->stateFlags2 & PLAYER_STATE2_6)) {
*outYawTarget = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_664->focus.pos);
return false;
}