summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2022-08-07 16:18:54 -0700
committerGitHub <noreply@github.com>2022-08-07 19:18:54 -0400
commit9f6bacbb883df3db1d3c73eb5a46d5de98cd4e99 (patch)
tree70c4d04269e55d235c808817e028794c16a6f5b1 /src/code
parentdb844b8ee8a06001ec355a291ee575158a2f5150 (diff)
Effect Firetail OK (#974)
* OK * description * gEffFire1DL * format * PR
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_actor.c2
-rw-r--r--src/code/z_fireobj.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 64d9c97f4..ae42cc1e3 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -4655,7 +4655,7 @@ void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, gGameplayKeepDrawFlameDL);
+ gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
}
break;
diff --git a/src/code/z_fireobj.c b/src/code/z_fireobj.c
index f77fc5158..d0b88b3db 100644
--- a/src/code/z_fireobj.c
+++ b/src/code/z_fireobj.c
@@ -162,7 +162,8 @@ void FireObj_Draw(PlayState* play, FireObj* fire) {
Matrix_Scale(fire->xScale, fire->yScale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, gGameplayKeepDrawFlameDL);
+ gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
+
CLOSE_DISPS(play->state.gfxCtx);
}
}