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

speedXZ -> speed (#1477)

Browse source 
* speedXZ -> speed

* +=

* revert arg in player function

* anon review

* engineer review

* forgot one

* last review

* revert decimal
This commit is contained in:
fig02 2022-12-24 12:18:57 -05:00 • committed by GitHub
parent 4a9873775c
commit 92e03cf747
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
171 changed files with 1771 additions and 1773 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/overlays/actors/ovl_En_Tp/z_en_tp.c
View file

@ -215,7 +215,7 @@ void EnTp_Tail_FollowHead(EnTp* this, PlayState* play) {
}
if (this->head->unk_150 != 0) {
this->actor.speedXZ = this->red = this->actor.velocity.y = this->heightPhase = 0.0f;
this->actor.speed = this->red = this->actor.velocity.y = this->heightPhase = 0.0f;
if (this->actor.world.pos.y < this->head->actor.home.pos.y) {
this->actor.flags &= ~ACTOR_FLAG_0;
}
@ -263,7 +263,7 @@ void EnTp_Head_ApproachPlayer(EnTp* this, PlayState* play) {
this->actor.world.pos.y += Math_CosF(this->heightPhase) * (2.0f + this->extraHeightVariation);
this->heightPhase += 0.2f;
Math_SmoothStepToF(&this->actor.speedXZ, 2.5f, 0.1f, 0.2f, 0.0f);
Math_SmoothStepToF(&this->actor.speed, 2.5f, 0.1f, 0.2f, 0.0f);
this->timer--;
if (this->timer != 0) {
@ -377,9 +377,9 @@ void EnTp_Head_TakeOff(EnTp* this, PlayState* play) {
s32 pad;
Player* player = GET_PLAYER(play);
Math_SmoothStepToF(&this->actor.speedXZ, 2.5f, 0.1f, 0.2f, 0.0f);
Math_SmoothStepToF(&this->actor.speed, 2.5f, 0.1f, 0.2f, 0.0f);
Math_SmoothStepToF(&this->actor.world.pos.y, player->actor.world.pos.y + 85.0f + this->horizontalVariation, 1.0f,
this->actor.speedXZ * 0.25f, 0.0f);
this->actor.speed * 0.25f, 0.0f);
Audio_PlaySfxGeneral(NA_SE_EN_TAIL_FLY - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
@ -399,7 +399,7 @@ void EnTp_Head_TakeOff(EnTp* this, PlayState* play) {
}
this->actor.world.pos.y +=
Math_CosF(this->heightPhase) * ((this->actor.speedXZ * 0.25f) + this->extraHeightVariation);
Math_CosF(this->heightPhase) * ((this->actor.speed * 0.25f) + this->extraHeightVariation);
this->actor.world.rot.y += this->unk_164;
this->heightPhase += 0.2f;
@ -423,7 +423,7 @@ void EnTp_Head_SetupWait(EnTp* this) {
this->actor.shape.rot.x = -0x4000;
this->timer = 60;
this->unk_15C = 0;
this->actor.speedXZ = 0.0f;
this->actor.speed = 0.0f;
EnTp_SetupAction(this, EnTp_Head_Wait);
}
@ -517,13 +517,13 @@ void EnTp_Head_BurrowReturnHome(EnTp* this, PlayState* play) {
if (this->actor.shape.rot.x != -0x4000) {
this->timer = 80;
this->actor.velocity.y = 0.0f;
this->actor.speedXZ = 0.0f;
this->actor.speed = 0.0f;
this->actor.world.pos = this->actor.home.pos;
this->actor.shape.rot.x = -0x4000;
for (now = (EnTp*)this->actor.child; now != NULL; now = (EnTp*)now->actor.child) {
now->actor.velocity.y = 0.0f;
now->actor.speedXZ = 0.0f;
now->actor.speed = 0.0f;
now->actor.world.pos = this->actor.home.pos;
now->actor.world.pos.y = this->actor.home.pos.y - 80.0f;
}
@ -540,7 +540,7 @@ void EnTp_Head_BurrowReturnHome(EnTp* this, PlayState* play) {
this->red -= 15;
}
this->actor.speedXZ = 2.0f * Math_CosS(this->actor.shape.rot.x);
this->actor.speed = 2.0f * Math_CosS(this->actor.shape.rot.x);
this->actor.velocity.y = Math_SinS(this->actor.shape.rot.x) * -2.0f;
if ((this->actor.world.pos.y - this->actor.floorHeight) < 20.0f) {
@ -681,7 +681,7 @@ void EnTp_Update(Actor* thisx, PlayState* play) {
}
// Turn away from wall
if ((this->actor.speedXZ != 0.0f) && (this->actor.bgCheckFlags & BGCHECKFLAG_WALL)) {
if ((this->actor.speed != 0.0f) && (this->actor.bgCheckFlags & BGCHECKFLAG_WALL)) {
yawToWall = this->actor.wallYaw - this->actor.world.rot.y;
if (ABS(yawToWall) > 0x4000) {