From 99cf87a87e291295c643b038fb6d910e860569d7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 11 Sep 2022 11:47:05 +1000 Subject: [PATCH] Non-matching build: Fix known functional mismatches --- src/game/title.c | 6 +++--- src/lib/vi.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/title.c b/src/game/title.c index d04c79789..c565c945c 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -1398,9 +1398,9 @@ Gfx *titleRenderPdLogoModel(Gfx *gdl, struct model *model, bool arg2, f32 arg3, } for (j = 0; j < s5rodata->numcolours; j++) { - spcc[0] = (s32)((s1[j].r * (65536 - s6) + s2[j].r * s6) / 65536); - spcc[1] = (s32)((s1[j].g * (65536 - s6) + s2[j].g * s6) / 65536); - spcc[2] = (s32)((s1[j].b * (65536 - s6) + s2[j].b * s6) / 65536); + spcc[0] = (s32)(((s8)s1[j].r * (65536 - s6) + (s8)s2[j].r * s6) / 65536); + spcc[1] = (s32)(((s8)s1[j].g * (65536 - s6) + (s8)s2[j].g * s6) / 65536); + spcc[2] = (s32)(((s8)s1[j].b * (65536 - s6) + (s8)s2[j].b * s6) / 65536); spc0[0] = spcc[0]; spc0[1] = spcc[1]; diff --git a/src/lib/vi.c b/src/lib/vi.c index 7eeedaeab..57e40b974 100644 --- a/src/lib/vi.c +++ b/src/lib/vi.c @@ -2301,7 +2301,7 @@ void viUpdateMode(void) g_ViFrontData = g_ViDataArray + g_ViFrontIndex; g_ViBackData = g_ViDataArray + g_ViBackIndex; - bcopy(prevdata, g_ViBackData, sizeof(g_ViBackData)); + bcopy(prevdata, g_ViBackData, sizeof(struct rend_vidat)); g_ViBackData->fb = g_FrameBuffers[g_ViBackIndex];