From 1ff18808eaec272c540d377377e69d14c36d6656 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Tue, 2 Apr 2024 13:14:50 -0500 Subject: [PATCH] Use define for showing HuSprGrpDrawNoSet prototype --- include/game/sprite.h | 3 +++ src/REL/instDll/main.c | 2 -- src/REL/modeltestDll/main.c | 1 + src/game/board/lottery.c | 2 -- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/game/sprite.h b/include/game/sprite.h index c08cf105..d944cc74 100644 --- a/include/game/sprite.h +++ b/include/game/sprite.h @@ -113,6 +113,9 @@ void HuSprGrpCenterSet(s16 group, float x, float y); void HuSprGrpZRotSet(s16 group, float z_rot); void HuSprGrpScaleSet(s16 group, float x, float y); void HuSprGrpTPLvlSet(s16 group, float tp_lvl); +#ifndef HUSPR_USE_OLD_DEFS +void HuSprGrpDrawNoSet(s16 group, s32 draw_no); +#endif void HuSprDrawNoSet(s16 group, s16 member, s32 draw_no); void HuSprPriSet(s16 group, s16 member, s16 prio); void HuSprGrpScissorSet(s16 group, s16 x, s16 y, s16 w, s16 h); diff --git a/src/REL/instDll/main.c b/src/REL/instDll/main.c index 4ba2b989..7c9ea6d0 100644 --- a/src/REL/instDll/main.c +++ b/src/REL/instDll/main.c @@ -21,8 +21,6 @@ #include "rel_sqrt_consts.h" -void HuSprGrpDrawNoSet(s16 group, s32 draw_no); - static s16 lbl_1_data_0 = 1; static omObjData *lbl_1_bss_60; diff --git a/src/REL/modeltestDll/main.c b/src/REL/modeltestDll/main.c index 444cea7a..f72c1fc2 100644 --- a/src/REL/modeltestDll/main.c +++ b/src/REL/modeltestDll/main.c @@ -1,3 +1,4 @@ +#define HUSPR_USE_OLD_DEFS #include "math.h" #include "game/chrman.h" #include "game/object.h" diff --git a/src/game/board/lottery.c b/src/game/board/lottery.c index 783e4d63..f5689a87 100755 --- a/src/game/board/lottery.c +++ b/src/game/board/lottery.c @@ -23,8 +23,6 @@ #include "math.h" -void HuSprGrpDrawNoSet(s16 group, s32 draw_no); - #define ABS(x) (((x) < 0) ? -(x) : (x)) typedef struct {