mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-03 01:54:37 +00:00
Code Issues Projects Releases Wiki Activity

fix merge problems

Browse source 
Signed-off-by: angie <angheloalf95@gmail.com>
This commit is contained in:
angie 2021-01-23 01:30:04 -03:00
parent 48964ff2a8
commit 05438ae79a
No known key found for this signature in database
GPG key ID: E5212BA1B6FEA700
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
View file

@ -229,7 +229,7 @@ void EffDust_UpdateFunc_8099DFC0(EffDust* this, GlobalContext* globalCtx) {
distanceTraveled++; distanceTraveled++;
} }
this->actor.posRot.pos = parent->posRot.pos; this->actor.world.pos = parent->world.pos;
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
i = this->index & 0x3F; i = this->index & 0x3F;
@ -322,9 +322,9 @@ void EffDust_DrawFunc_8099E4F4(EffDust* this, GlobalContext* globalCtx) {
aux = 1.0f - (*distanceTraveled * *distanceTraveled); aux = 1.0f - (*distanceTraveled * *distanceTraveled);
Matrix_Translate( Matrix_Translate(
this2->actor.posRot.pos.x + (initialPositions->x * ((this2->dx * aux) + (1.0f - this2->dx))), this2->actor.world.pos.x + (initialPositions->x * ((this2->dx * aux) + (1.0f - this2->dx))),
this2->actor.posRot.pos.y + (initialPositions->y * ((this2->dy * aux) + (1.0f - this2->dy))), this2->actor.world.pos.y + (initialPositions->y * ((this2->dy * aux) + (1.0f - this2->dy))),
this2->actor.posRot.pos.z + (initialPositions->z * ((this2->dz * aux) + (1.0f - this2->dz))), this2->actor.world.pos.z + (initialPositions->z * ((this2->dz * aux) + (1.0f - this2->dz))),
MTXMODE_NEW); MTXMODE_NEW);
Matrix_Scale(this2->scalingFactor, this2->scalingFactor, this2->scalingFactor, MTXMODE_APPLY); Matrix_Scale(this2->scalingFactor, this2->scalingFactor, this2->scalingFactor, MTXMODE_APPLY);