mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +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

10
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -257,7 +257,7 @@ void func_80A0214C(EnElf* this, PlayState* play) {
this->unk_2AC = 0x400;
this->unk_2B8 = 2.0f;
this->func_2C8 = func_80A020A4;
this->actor.speedXZ = 1.5f;
this->actor.speed = 1.5f;
this->unk_2C0 = (s16)Rand_ZeroFloat(8.0f) + 4;
} else {
this->unk_2C0 = 10;
@ -542,7 +542,7 @@ void func_80A03018(EnElf* this, PlayState* play) {
s16 targetYaw;
Vec3f* unk_28C = &this->unk_28C;
Math_SmoothStepToF(&this->actor.speedXZ, this->unk_2B8, 0.2f, 0.5f, 0.01f);
Math_SmoothStepToF(&this->actor.speed, this->unk_2B8, 0.2f, 0.5f, 0.01f);
switch (this->unk_2A8) {
case 0:
@ -584,7 +584,7 @@ void func_80A03148(EnElf* this, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4) {
xzVelocity = sqrtf(SQ(xVelTarget) + SQ(zVelTarget));
this->actor.speedXZ = clampedXZ = CLAMP(xzVelocity, arg2, arg3);
this->actor.speed = clampedXZ = CLAMP(xzVelocity, arg2, arg3);
if ((xzVelocity != clampedXZ) && (xzVelocity != 0.0f)) {
xzVelocity = clampedXZ / xzVelocity;
@ -941,7 +941,7 @@ void func_80A03CF8(EnElf* this, PlayState* play) {
if (arrowPointedActor != NULL) {
func_80A03148(this, &nextPos, 0.0f, 20.0f, 0.2f);
if (this->actor.speedXZ >= 5.0f) {
if (this->actor.speed >= 5.0f) {
EnElf_SpawnSparkles(this, play, 16);
}
} else {
@ -1240,7 +1240,7 @@ void func_80A04DE4(EnElf* this, PlayState* play) {
func_80A03148(this, &headCopy, 0, 20.0f, 0.2f);
if (this->actor.speedXZ >= 5.0f) {
if (this->actor.speed >= 5.0f) {
EnElf_SpawnSparkles(this, play, 16);
}