mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup: Remove uneeded casts on collider members (#1595)

Browse source 
* rm casts

* format
This commit is contained in:
fig02 2023-12-10 14:53:51 -05:00 committed by GitHub
parent cc96184a96
commit 0ed57f61b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -1977,8 +1977,8 @@ void EnGo2_Update(Actor* thisx, PlayState* play) {
EnGo2_SitDownAnimation(this); EnGo2_SitDownAnimation(this);
SkelAnime_Update(&this->skelAnime); SkelAnime_Update(&this->skelAnime);
EnGo2_RollForward(this); EnGo2_RollForward(this);
Actor_UpdateBgCheckInfo(play, &this->actor, (f32)this->collider.dim.height * 0.5f, Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.height * 0.5f, this->collider.dim.radius * 0.6f,
(f32)this->collider.dim.radius * 0.6f, 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2); 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) { if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) {
func_80A44AB0(this, play); func_80A44AB0(this, play);
} }

4
src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View file

@ -350,7 +350,7 @@ void EnMa1_IdleTeachSong(EnMa1* this, PlayState* play) {
this->interactInfo.talkState = NPC_TALK_STATE_TALKING; this->interactInfo.talkState = NPC_TALK_STATE_TALKING;
this->actor.flags |= ACTOR_FLAG_16; this->actor.flags |= ACTOR_FLAG_16;
this->actionFunc = EnMa1_StartTeachSong; this->actionFunc = EnMa1_StartTeachSong;
} else if (this->actor.xzDistToPlayer < 30.0f + (f32)this->collider.dim.radius) { } else if (this->actor.xzDistToPlayer < 30.0f + this->collider.dim.radius) {
player->stateFlags2 |= PLAYER_STATE2_23; player->stateFlags2 |= PLAYER_STATE2_23;
} }
} }
@ -401,7 +401,7 @@ void EnMa1_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play); this->actionFunc(this, play);
if (this->actionFunc != EnMa1_DoNothing) { if (this->actionFunc != EnMa1_DoNothing) {
Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, (f32)this->collider.dim.radius + 30.0f, Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->collider.dim.radius + 30.0f,
EnMa1_GetTextId, EnMa1_UpdateTalkState); EnMa1_GetTextId, EnMa1_UpdateTalkState);
} }

4
src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
View file

@ -268,7 +268,7 @@ void func_80AA204C(EnMa2* this, PlayState* play) {
player->stateFlags2 |= PLAYER_STATE2_25; player->stateFlags2 |= PLAYER_STATE2_25;
Message_StartOcarina(play, OCARINA_ACTION_CHECK_EPONA); Message_StartOcarina(play, OCARINA_ACTION_CHECK_EPONA);
this->actionFunc = func_80AA20E4; this->actionFunc = func_80AA20E4;
} else if (this->actor.xzDistToPlayer < 30.0f + (f32)this->collider.dim.radius) { } else if (this->actor.xzDistToPlayer < 30.0f + this->collider.dim.radius) {
player->stateFlags2 |= PLAYER_STATE2_23; player->stateFlags2 |= PLAYER_STATE2_23;
} }
} }
@ -319,7 +319,7 @@ void EnMa2_Update(Actor* thisx, PlayState* play) {
func_80AA1DB4(this, play); func_80AA1DB4(this, play);
func_80AA1AE4(this, play); func_80AA1AE4(this, play);
if (this->actionFunc != func_80AA20E4) { if (this->actionFunc != func_80AA20E4) {
Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, (f32)this->collider.dim.radius + 30.0f, Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->collider.dim.radius + 30.0f,
EnMa2_GetTextId, EnMa2_UpdateTalkState); EnMa2_GetTextId, EnMa2_UpdateTalkState);
} }
} }

2
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file

@ -297,7 +297,7 @@ void EnMa3_Update(Actor* thisx, PlayState* play) {
EnMa3_UpdateEyes(this); EnMa3_UpdateEyes(this);
this->actionFunc(this, play); this->actionFunc(this, play);
func_80AA2E54(this, play); func_80AA2E54(this, play);
Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, (f32)this->collider.dim.radius + 150.0f, Npc_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, this->collider.dim.radius + 150.0f,
EnMa3_GetTextId, EnMa3_UpdateTalkState); EnMa3_GetTextId, EnMa3_UpdateTalkState);
if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) { if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) {
if (this->isNotSinging) { if (this->isNotSinging) {