mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +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

8
src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c
View file

@ -76,20 +76,20 @@ void EnLightbox_Update(Actor* thisx, PlayState* play) {
if (Actor_HasParent(thisx, play)) {
this->dyna.unk_162++;
} else {
if (thisx->speedXZ) {
if (thisx->speed) {
if (thisx->bgCheckFlags & BGCHECKFLAG_WALL) {
thisx->world.rot.y = (thisx->world.rot.y + thisx->wallYaw) - thisx->world.rot.y;
Audio_PlaySfxGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
thisx->speedXZ *= 0.7f;
thisx->speed *= 0.7f;
thisx->bgCheckFlags &= ~BGCHECKFLAG_WALL;
}
}
if (!(thisx->bgCheckFlags & BGCHECKFLAG_GROUND)) {
Math_StepToF(&thisx->speedXZ, 0, IREG(57) / 100.0f);
Math_StepToF(&thisx->speed, 0, IREG(57) / 100.0f);
} else {
Math_StepToF(&thisx->speedXZ, 0, IREG(58) / 100.0f);
Math_StepToF(&thisx->speed, 0, IREG(58) / 100.0f);
if ((thisx->bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) && (thisx->velocity.y < IREG(59) / 100.0f)) {
Audio_PlaySfxGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);