diff options
| author | Tom Overton <tom-overton@users.noreply.github.com> | 2022-01-19 05:37:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 10:37:18 -0300 |
| commit | 97b47fa14b7458d2aca604f095be31e12187346c (patch) | |
| tree | b21939b560627db362b5ae283ee5e4bd6f5162e5 /src/code | |
| parent | 6d52cee5fece3197dcca12e87412b185f58e7cb5 (diff) | |
Fix some more dummy label matches (#619)
* Fix some more dummy label matches
* Add missing space
* Add a space to force Jenkins to run again
* Remove the previous space
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 11 | ||||
| -rw-r--r-- | src/code/z_eff_tire_mark.c | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 0b38d135f..d433ae12c 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -320,13 +320,12 @@ void func_800B4AEC(GlobalContext* globalCtx, Actor* actor, f32 y) { void func_800B4B50(Actor* actor, Lights* mapper, GlobalContext* globalCtx) { f32 spEC; f32 temp_f12; - f32 temp_f20; f32 shadowScaleZ; f32 temp_f22; f32 temp_f24; f32 temp_f8; - MtxF sp94; s32 lightNum; + MtxF sp94; s32 numLights; s8 phi_v1; u8 temp_v0; @@ -342,7 +341,8 @@ void func_800B4B50(Actor* actor, Lights* mapper, GlobalContext* globalCtx) { spEC = actor->world.pos.y - actor->floorHeight; if (spEC > 20.0f) { - temp_f20 = actor->shape.shadowScale; + f32 temp_f20 = actor->shape.shadowScale; + temp_v0 = actor->shape.shadowAlpha; actor->shape.shadowScale *= 0.3f; temp_f12 = (spEC - 20.0f) * 0.02f; @@ -350,7 +350,6 @@ void func_800B4B50(Actor* actor, Lights* mapper, GlobalContext* globalCtx) { ActorShadow_DrawCircle(actor, mapper, globalCtx); actor->shape.shadowScale = temp_f20; actor->shape.shadowAlpha = temp_v0; - dummy_label_111649:; } else if (spEC >= -1.0f) { numLights = mapper->numLights - 2; @@ -377,8 +376,8 @@ void func_800B4B50(Actor* actor, Lights* mapper, GlobalContext* globalCtx) { for (j = 0; j < 2; j++, phi_s0++) { if (phi_s0->l.dir[1] > 0) { - lightNum = (ABS_ALT(phi_s0->l.dir[1]) * (phi_s0->l.col[0] + phi_s0->l.col[1] + phi_s0->l.col[2])) - - (lightNumMax * ((void)0, 8)); + lightNum = ((phi_s0->l.col[0] + phi_s0->l.col[1] + phi_s0->l.col[2]) * ABS_ALT(phi_s0->l.dir[1])) - + (8 * lightNumMax); if (lightNum > 0) { ActorShadow_DrawFoot(globalCtx, phi_s0, &sp94, lightNum, temp_f22, temp_f24, shadowScaleZ); } diff --git a/src/code/z_eff_tire_mark.c b/src/code/z_eff_tire_mark.c index 517ee5251..e893de8a0 100644 --- a/src/code/z_eff_tire_mark.c +++ b/src/code/z_eff_tire_mark.c @@ -255,11 +255,12 @@ void EffectTireMark_Draw(void* thisx, GraphicsContext* gfxCtx) { if ((elem - 1)->flags & 1) { if (!(elem->flags & 1)) { + s32 requiredScopeTemp; + vtx[i * 2 + 0].v.tc[0] = 0; vtx[i * 2 + 0].v.tc[1] = 0; vtx[i * 2 + 1].v.tc[0] = 0; vtx[i * 2 + 1].v.tc[1] = 1024; - dummy_label:; } else if ((i >= 2) && !((elem - 2)->flags & 1)) { vtx[i * 2 - 2].v.tc[0] = 0; vtx[i * 2 - 2].v.tc[1] = 0; |