Skip to content

Commit 80302b5

Browse files
committed
Some inline_depth pragmas
inline_depth(5) is a guess at how `-inline auto` should behave based on the function in zTaskBox, and it seems to match the most functions from what I can tell
1 parent a41e3b1 commit 80302b5

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

src/SB/Core/x/xWad4.cpp

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,13 +608,15 @@ S32 xSGWriteData(st_XSAVEGAME_DATA* xsgdata, st_XSAVEGAME_WRITECONTEXT* wctxt, c
608608
return cnt;
609609
}
610610

611+
#pragma inline_depth(0)
611612
S32 xSG_cb_leader_load(void*, st_XSAVEGAME_DATA* original_xsgdata, st_XSAVEGAME_READCONTEXT* rctxt,
612613
U32, S32)
613614
{
614615
char fundata[32] = {};
615616
st_XSAVEGAME_LEADER discard = {};
616-
xSGReadData(original_xsgdata, rctxt, discard.gameLabel, sizeof(st_XSAVEGAME_LEADER));
617-
xSGReadData(original_xsgdata, rctxt, fundata, 0x16);
617+
// TODO: Fix last two args in function signature
618+
xSGReadData(original_xsgdata, rctxt, discard.gameLabel, 1, sizeof(st_XSAVEGAME_LEADER));
619+
xSGReadData(original_xsgdata, rctxt, fundata, 1, 0x16);
618620
return 1;
619621
}
620622

@@ -631,10 +633,12 @@ S32 xSG_cb_leader_svproc(void* cltdata, st_XSAVEGAME_DATA* original_xsgdata,
631633
leader.progress = xsg->progress;
632634
leader.thumbIconIdx = xsg->thumbIconIdx;
633635

634-
xSGWriteData(original_xsgdata, wctxt, leader.gameLabel, sizeof(st_XSAVEGAME_LEADER));
635-
xSGWriteData(original_xsgdata, wctxt, fundata, 0x16);
636+
// TODO: Fix last two args in function signature
637+
xSGWriteData(original_xsgdata, wctxt, leader.gameLabel, 1, sizeof(st_XSAVEGAME_LEADER));
638+
xSGWriteData(original_xsgdata, wctxt, fundata, 1, 0x16);
636639
return 1;
637640
}
641+
#pragma inline_depth(5)
638642

639643
S32 xSG_cb_leader_svinfo(void*, st_XSAVEGAME_DATA*, S32* cur_space, S32* max_fullgame)
640644
{
@@ -839,6 +843,7 @@ S32 xSGProcess(st_XSAVEGAME_DATA* xsgdata)
839843
return result;
840844
}
841845

846+
842847
S32 xSGSetup(st_XSAVEGAME_DATA* xsgdata, S32 gidx, char* label, S32 progress, iTime playtime,
843848
S32 thumbIconIdx)
844849
{
@@ -885,10 +890,12 @@ S32 xSGSetup(st_XSAVEGAME_DATA* xsgdata, S32 gidx, char* label, S32 progress, iT
885890
return result;
886891
}
887892

893+
#pragma inline_depth(0)
888894
S32 xSGSetup(st_XSAVEGAME_DATA* xsgdata)
889895
{
890896
return xSGSetup(xsgdata, 0, "nothing", -1, 0, 0);
891897
}
898+
#pragma inline_depth(5)
892899

893900
S32 xSGAddLoadClient(st_XSAVEGAME_DATA* xsgdata, U32 clttag, void* cltdata,
894901
S32 (*loadfunc)(void*, st_XSAVEGAME_DATA*, st_XSAVEGAME_READCONTEXT*, U32,
@@ -1272,6 +1279,7 @@ S32 xSGDone(st_XSAVEGAME_DATA* xsgdata)
12721279
return result;
12731280
}
12741281

1282+
#pragma inline_depth(0)
12751283
st_XSAVEGAME_DATA* xSGInit(en_SAVEGAME_MODE mode)
12761284
{
12771285
st_XSAVEGAME_DATA* xsgdata = &g_xsgdata;
@@ -1300,6 +1308,7 @@ st_XSAVEGAME_DATA* xSGInit(en_SAVEGAME_MODE mode)
13001308
memset(&g_leaders, 0, sizeof(g_leaders));
13011309
return xsgdata;
13021310
}
1311+
#pragma inline_depth(5)
13031312

13041313
S32 xSGShutdown()
13051314
{
@@ -2476,6 +2485,7 @@ void PKR_ReadDone(st_PACKER_READ_DATA* pr)
24762485
g_loadlock &= ~(1 << lockid);
24772486
}
24782487

2488+
#pragma inline_depth(0)
24792489
st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, const char* pkgfile, U32 opts, S32* cltver,
24802490
PKRAssetType* typelist, int)
24812491
{
@@ -2543,6 +2553,7 @@ st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, const char* pkgfile, U32 opts,
25432553
tocbuf_RAW[0] = NULL;
25442554
return pr;
25452555
}
2556+
#pragma inline_depth(5)
25462557

25472558
S32 PKRLoadStep(S32)
25482559
{

src/SB/Game/zNMETypeBossDennis.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ void zNMEDennis::MeterRender()
2020
{
2121
}
2222

23+
#pragma inline_depth(0)
2324
void zNMEDennis::RenderHud()
2425
{
2526
zNMEDennis::MeterRender();
2627
}
28+
#pragma inline_depth(5)
2729

2830
S32 zNMEDennis::DfltVulnFlags()
2931
{

src/SB/Game/zSaveLoad.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,6 +1237,7 @@ S32 zSaveLoad_CardCheckSlotEmpty(S32 cardNumber, S32 gameNumber)
12371237
return 1;
12381238
}
12391239

1240+
#pragma inline_depth(0)
12401241
S32 zSaveLoad_CardCheckGameSlot(S32 cardNumber, S32 gameNumber, S32 mode)
12411242
{
12421243
if (mode == 1)
@@ -1248,6 +1249,7 @@ S32 zSaveLoad_CardCheckGameSlot(S32 cardNumber, S32 gameNumber, S32 mode)
12481249
return zSaveLoad_CardCheckSlotOverwrite(cardNumber, gameNumber);
12491250
}
12501251
}
1252+
#pragma inline_depth(5)
12511253

12521254
S32 zSaveLoad_CardCheckGames(S32 cardNumber, S32 mode)
12531255
{
@@ -1293,6 +1295,7 @@ S32 zSaveLoad_CardCheckSpace(S32 cardNumber, S32 mode)
12931295
return 1;
12941296
}
12951297

1298+
#pragma inline_depth(0)
12961299
S32 zSaveLoad_CardCheckValid(S32 cardNumber, S32 mode)
12971300
{
12981301
if (mode == 1)
@@ -1304,6 +1307,7 @@ S32 zSaveLoad_CardCheckValid(S32 cardNumber, S32 mode)
13041307
return zSaveLoad_CardCheckSpace(cardNumber, mode);
13051308
}
13061309
}
1310+
#pragma inline_depth(5)
13071311

13081312
S32 zSaveLoad_CardCheckFormatted(S32 cardNumber, S32 mode)
13091313
{

0 commit comments

Comments
 (0)