Remove Faerie data #ifdef (#1922)
Some checks are pending
Format code / format (push) Waiting to run
Build C code / extract-assets (push) Waiting to run
Build C code / build-linux (x86_64, Debug, clang, custom) (push) Blocked by required conditions
Build C code / build-linux (x86_64, Debug, clang, lle) (push) Blocked by required conditions
Build C code / build-linux (x86_64, Debug, gcc, custom) (push) Blocked by required conditions
Build C code / build-linux (x86_64, Debug, gcc, lle) (push) Blocked by required conditions
Build C code / build-linux (x86_64, RelWithDebInfo, clang, custom) (push) Blocked by required conditions
Build C code / build-linux (x86_64, RelWithDebInfo, clang, lle) (push) Blocked by required conditions
Build C code / build-linux (x86_64, RelWithDebInfo, gcc, custom) (push) Blocked by required conditions
Build C code / build-linux (x86_64, RelWithDebInfo, gcc, lle) (push) Blocked by required conditions
Build C code / build-macos (Debug, custom) (push) Blocked by required conditions
Build C code / build-macos (Debug, lle) (push) Blocked by required conditions
Build C code / build-macos (RelWithDebInfo, custom) (push) Blocked by required conditions
Build C code / build-macos (RelWithDebInfo, lle) (push) Blocked by required conditions
Build C code / build-windows (Debug, custom) (push) Blocked by required conditions
Build C code / build-windows (Debug, lle) (push) Blocked by required conditions
Build C code / build-windows (RelWithDebInfo, custom) (push) Blocked by required conditions
Build C code / build-windows (RelWithDebInfo, lle) (push) Blocked by required conditions
Build Saturn version / build-and-test-saturn (push) Waiting to run
Build Saturn version / function-finder-saturn (push) Waiting to run
Build PSX and PSP version / build-and-test (pspeu, hd) (push) Waiting to run
Build PSX and PSP version / build-and-test (pspeu, pspeu) (push) Waiting to run
Build PSX and PSP version / build-and-test (us, us) (push) Waiting to run
Build PSX and PSP version / generate-progress-report (pspeu, hd) (push) Blocked by required conditions
Build PSX and PSP version / generate-progress-report (pspeu, pspeu) (push) Blocked by required conditions
Build PSX and PSP version / generate-progress-report (us, us) (push) Blocked by required conditions
Build PSX and PSP version / generate-duplicates-report (us, us) (push) Blocked by required conditions
Build PSX and PSP version / generate-duplicates-report-psp (pspeu, pspeu) (push) Blocked by required conditions

Simple follow-up to #1913. The `s32*` type (or any pointer type) already
aligns with the targeted architecture. So there is no need for a
`#ifdef`

cc. @Onenutmcgee
This commit is contained in:
Luciano Ciccariello 2024-11-21 05:51:24 +00:00 committed by GitHub
parent eee73de42a
commit 3809ebf679
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 20 deletions

View File

@ -1343,7 +1343,7 @@ void UpdateServantAdditionalInit(Entity* arg0) {
rnd = rand() % 0x100;
if (s_FaerieStats.unk8 == 1) {
for (i = 0; true; i++) {
if (rnd <= g_FaerieIntroRandomizer[i * 2]) {
if (rnd <= (s32)g_FaerieIntroRandomizer[i * 2]) {
arg0->ext.faerie.currentSfxEvent =
(FaerieSfxEventDesc*)g_FaerieIntroRandomizer[i * 2 + 1];
break;
@ -1351,7 +1351,7 @@ void UpdateServantAdditionalInit(Entity* arg0) {
}
} else {
for (i = 0; true; i++) {
if (rnd <= g_SfxEventRandomizer[i * 2]) {
if (rnd <= (s32)g_SfxEventRandomizer[i * 2]) {
arg0->ext.faerie.currentSfxEvent =
(FaerieSfxEventDesc*)g_SfxEventRandomizer[i * 2 + 1];
break;

View File

@ -105,11 +105,5 @@ typedef struct {
} ItemPrimitiveParams; // size = 0x1C
extern SpriteParts* g_FaerieSpriteParts[];
#ifdef PLATFORM_64BIT
extern s64 g_FaerieIntroRandomizer[];
extern s64 g_SfxEventRandomizer[];
#else
extern s32 g_FaerieIntroRandomizer[];
extern s32 g_SfxEventRandomizer[];
#endif
extern s32* g_FaerieIntroRandomizer[];
extern s32* g_SfxEventRandomizer[];

View File

@ -21,11 +21,7 @@ static FaerieSfxEventDesc s_IntroEventCommandVO[] = {
{ 0, 34, NA_VO_FAERIE_INTRO_COMMAND },
{-1, 14, 0}};
#ifdef VERSION_PC
s64 g_FaerieIntroRandomizer[] = {
#else
s32 g_FaerieIntroRandomizer[] = {
#endif
s32* g_FaerieIntroRandomizer[] = {
0x0000007F, s_IntroEventLifeVO, 0x000000FF, s_IntroEventCommandVO};
static FaerieSfxEventDesc s_SfxEventLetsGo[] = {
@ -35,11 +31,7 @@ static FaerieSfxEventDesc s_SfxEventFollow[] = {
{ 0, 38, NA_VO_FAERIE_FOLLOW },
{-1, 14, 0}};
#ifdef VERSION_PC
s64 g_SfxEventRandomizer[] = {
#else
s32 g_SfxEventRandomizer[] = {
#endif
s32* g_SfxEventRandomizer[] = {
0x0000007F, s_SfxEventLetsGo, 0x000000FF, s_SfxEventFollow};
// position data with a flag field