From 660d7060e493ada17d952575df06efc9f702658e Mon Sep 17 00:00:00 2001 From: GenericHeroGuy <86008856+GenericHeroGuy@users.noreply.github.com> Date: Tue, 27 Feb 2024 17:37:22 +0100 Subject: [PATCH] Don't return aggregates --- src/k_kart.c | 42 ++++++++++++++++++++---------------------- src/k_kart.h | 6 +++--- src/lua_hudlib.c | 6 +++--- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 53514a486..7ae64428b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7628,10 +7628,9 @@ INT32 K_calcSplitFlags(INT32 snapflags) return (splitflags|snapflags); } -drawinfo_t K_getItemBoxDrawinfo(void) +void K_getItemBoxDrawinfo(drawinfo_t *out) { INT32 fx, fy, fflags; - drawinfo_t info; // pain and suffering defined below if (splitscreen < 2) // don't change shit for THIS splitscreen. @@ -7656,16 +7655,14 @@ drawinfo_t K_getItemBoxDrawinfo(void) } } - info.x = fx; - info.y = fy; - info.flags = fflags; - return info; + out->x = fx; + out->y = fy; + out->flags = fflags; } -drawinfo_t K_getLapsDrawinfo(void) +void K_getLapsDrawinfo(drawinfo_t *out) { INT32 fx, fy, fflags; - drawinfo_t info; // pain and suffering defined below if (splitscreen < 2) // don't change shit for THIS splitscreen. @@ -7690,21 +7687,18 @@ drawinfo_t K_getLapsDrawinfo(void) } } - info.x = fx; - info.y = fy; - info.flags = fflags; - return info; + out->x = fx; + out->y = fy; + out->flags = fflags; } -drawinfo_t K_getMinimapDrawinfo(void) +void K_getMinimapDrawinfo(drawinfo_t *out) { INT32 fx = MINI_X, fy = MINI_Y, fflags = (splitscreen == 3 ? 0 : V_SNAPTORIGHT); // flags should only be 0 when it's centered (4p split) - drawinfo_t info; - info.x = fx; - info.y = fy; - info.flags = fflags; - return info; + out->x = fx; + out->y = fy; + out->flags = fflags; } patch_t *K_getItemBoxPatch(boolean small, boolean dark) @@ -8079,7 +8073,8 @@ static void K_drawKartItem(void) } localbg = K_getItemBoxPatch((boolean)offset, dark); - drawinfo_t info = K_getItemBoxDrawinfo(); + drawinfo_t info; + K_getItemBoxDrawinfo(&info); fx = info.x; fy = info.y; fflags = info.flags; @@ -8703,7 +8698,8 @@ static void K_drawKartLaps(void) boolean flipstring = splitscreen > 1 && stplyrnum & 1; // used for 3p or 4p INT32 stringw = 0; // used with the above - drawinfo_t info = K_getLapsDrawinfo(); + drawinfo_t info; + K_getLapsDrawinfo(&info); fx = info.x; fy = info.y; fflags = info.flags; @@ -8881,7 +8877,8 @@ static void K_drawKartBumpersOrKarma(void) boolean flipstring = splitscreen > 1 && stplyrnum & 1; // same as laps, used for splitscreen INT32 stringw = 0; // used with the above - drawinfo_t info = K_getLapsDrawinfo(); + drawinfo_t info; + K_getLapsDrawinfo(&info); fx = info.x; fy = info.y; fflags = info.flags; @@ -9718,7 +9715,8 @@ static void K_drawKartMinimap(void) else return; // no pic, just get outta here - drawinfo_t info = K_getMinimapDrawinfo(); + drawinfo_t info; + K_getMinimapDrawinfo(&info); x = info.x - (AutomapPic->width/2); y = info.y - (AutomapPic->height/2); splitflags = info.flags; diff --git a/src/k_kart.h b/src/k_kart.h index 2e1589c29..a486f8cf2 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -107,9 +107,9 @@ typedef struct patch_t *K_getItemBoxPatch(boolean small, boolean dark); patch_t *K_getItemMulPatch(boolean small); -drawinfo_t K_getItemBoxDrawinfo(void); -drawinfo_t K_getLapsDrawinfo(void); -drawinfo_t K_getMinimapDrawinfo(void); +void K_getItemBoxDrawinfo(drawinfo_t *out); +void K_getLapsDrawinfo(drawinfo_t *out); +void K_getMinimapDrawinfo(drawinfo_t *out); // ========================================================================= #endif // __K_KART__ diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index 8dd028bf4..ed070387b 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -1166,9 +1166,9 @@ static int libd_getDrawInfo(lua_State *L) drawinfo_t info; switch(option) { - case huddrawinfo_item: info = K_getItemBoxDrawinfo(); break; - case huddrawinfo_gametypeinfo: info = K_getLapsDrawinfo(); break; - case huddrawinfo_minimap: info = K_getMinimapDrawinfo(); break; + case huddrawinfo_item: K_getItemBoxDrawinfo(&info); break; + case huddrawinfo_gametypeinfo: K_getLapsDrawinfo(&info); break; + case huddrawinfo_minimap: K_getMinimapDrawinfo(&info); break; default: return 0; // unreachable }