Merge pull request bfbbdecomp#32 from bluisblu/dev

JoshSanch · web-flow · commit a39c30074f4a · 2025-11-12T20:27:54.000-06:00
Set inline to auto
diff --git a/configure.py b/configure.py
@@ -227,11 +227,11 @@
 # dolphin library flags
 cflags_dolphin = [
     *cflags_base,
-    "-lang=c", 
+    "-lang=c",
     "-fp fmadd",
     "-fp_contract off",
     "-char signed",
-    "-str reuse", 
+    "-str reuse",
     "-common off",
     "-O4,p",
     #"-requireprotos"
@@ -240,11 +240,11 @@
 # Renderware library flags
 cflags_renderware = [
     *cflags_base,
-    "-lang=c", 
+    "-lang=c",
     "-fp fmadd",
     "-fp_contract off",
     "-char signed",
-    "-str reuse", 
+    "-str reuse",
     "-common off",
     "-O4,p",
     #"-requireprotos"
@@ -265,7 +265,7 @@
     "-str reuse,pool,readonly",
     "-use_lmw_stmw on",
     '-pragma "cpp_extensions on"',
-    "-inline off",
+    "-inline auto",
     "-gccinc",
     "-i include/bink",
     "-i include/inline",
@@ -368,15 +368,15 @@ def MatchingFor(*versions):
             Object(NonMatching, "SB/Core/x/xModelBlur.cpp"),
             Object(NonMatching, "SB/Core/x/xCamera.cpp"),
             Object(NonMatching, "SB/Game/zWadNME.cpp"),
-            Object(NonMatching, "SB/Game/zWad1.cpp"), 
+            Object(NonMatching, "SB/Game/zWad1.cpp"),
             Object(NonMatching, "SB/Game/zWad2.cpp"),
             Object(NonMatching, "SB/Game/zWad3.cpp"),
             Object(NonMatching, "SB/Game/zWadEnt.cpp"),
             Object(NonMatching, "SB/Game/zWadHud.cpp"),
             Object(NonMatching, "SB/Game/zWadUI.cpp"),
             Object(NonMatching, "SB/Game/zMain.cpp"),
-            Object(NonMatching, "SB/Game/zTalkBox.cpp"),
-            Object(NonMatching, "SB/Game/zTaskBox.cpp"),
+            Object(NonMatching, "SB/Game/zTalkBox.cpp", extra_cflags=["-inline off"]),
+            Object(NonMatching, "SB/Game/zTaskBox.cpp", extra_cflags=["-inline off"]),
             Object(NonMatching, "SB/Game/zSmoke.cpp"),
             Object(NonMatching, "SB/Game/zSplash.cpp"),
             Object(NonMatching, "SB/Game/zExplosion.cpp"),
@@ -398,7 +398,7 @@ def MatchingFor(*versions):
             Object(Matching, "SB/Core/gc/iException.cpp"),
             Object(NonMatching, "SB/Core/gc/iScrFX.cpp"),
             Object(NonMatching, "SB/Core/gc/iARAMTmp.cpp"),
-        
+
         ],
     },
  {
@@ -452,7 +452,7 @@ def MatchingFor(*versions):
         [
             Object(Matching, "dolphin/src/ar/ar.c"),
             Object(Matching, "dolphin/src/ar/arq.c")
-        ]        
+        ]
     ),
     DolphinLib(
         "ax",
@@ -484,7 +484,7 @@ def MatchingFor(*versions):
         "base",
         [
             Object(Matching, "dolphin/src/base/PPCArch.c")
-        ]        
+        ]
     ),
     DolphinLib(
         "card",
@@ -519,7 +519,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "dolphin/src/dsp/dsp.c"),
             Object(Matching, "dolphin/src/dsp/dsp_debug.c"),
             Object(NonMatching, "dolphin/src/dsp/dsp_task.c")
-        ]        
+        ]
     ),
     DolphinLib(
         "dvd",
@@ -562,7 +562,7 @@ def MatchingFor(*versions):
         ]
     ),
     DolphinLib(
-        "mix", 
+        "mix",
         [
             Object(NonMatching, "dolphin/src/mix/mix.c")
         ]
@@ -683,14 +683,14 @@ def MatchingFor(*versions):
             Object(NonMatching, "MSL_C/MSL_Common/strtold.c"),
             Object(NonMatching, "MSL_C/MSL_Common/strtoul.c"),
             Object(Matching, "MSL_C/MSL_Common/float.c"),
-            Object(NonMatching, "MSL_C/MSL_Common/char_io.c"),  
-            Object(NonMatching, "MSL_C/MSL_Common/wchar_io.c"),  
+            Object(NonMatching, "MSL_C/MSL_Common/char_io.c"),
+            Object(NonMatching, "MSL_C/MSL_Common/wchar_io.c"),
             Object(NonMatching, "MSL_C/MSL_Common_Embedded/uart_console_io_gcn.c")
         ]
     ),
     mslLib(
         "fdlibm.PPCEABI.H",
-        [],          
+        [],
         [
             Object(Matching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c"),
             Object(Matching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c"),
@@ -747,7 +747,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c"),
             #Object(NonMatching, "debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s"),
             Object(Matching, "debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c"),
-            Object(NonMatching, "debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c"),   
+            Object(NonMatching, "debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c"),
             Object(NonMatching, "debugger/embedded/MetroTRK/Os/dolphin/usr_put.c"),
             Object(NonMatching, "debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c"),
             Object(Matching, "debugger/embedded/MetroTRK/Os/dolphin/targcont.c"),
diff --git a/src/SB/Core/gc/iWad.cpp b/src/SB/Core/gc/iWad.cpp
@@ -423,6 +423,7 @@ static S32 iSG_mc_fclose(st_ISG_MEMCARD_DATA* mcdata)
     return iSG_mc_fclose(mcdata, NULL);
 }
 
+// Inlining issue
 static S32 iSG_mc_fopen(st_ISG_MEMCARD_DATA* mcdata, const char* fname, S32 fsize,
                         en_ISG_IOMODE mode, en_ASYNC_OPERR* operr)
 {
@@ -857,6 +858,7 @@ static S32 iSG_bnr_unpack(st_ISG_TPL_TEXPALETTE* tpl)
     return iSG_tpl_unpack(tpl);
 }
 
+// Inlining issue
 static S32 iSG_load_icondata()
 {
     g_rawicon = (st_ISG_TPL_TEXPALETTE*)iFileLoad("/SBGCIcon.tpl", NULL, &g_iconsize);
@@ -1516,6 +1518,7 @@ char* iSGFileModDate(st_ISGSESSION* isgdata, const char* fname, S32* sec, S32* m
     return datestr;
 }
 
+// Inlining issue
 char* iSGFileModDate(st_ISGSESSION* isgdata, const char* fname)
 {
     return iSGFileModDate(isgdata, fname, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -1559,6 +1562,7 @@ S32 iSGFileSize(st_ISGSESSION* isgdata, const char* fname)
     return ret;
 }
 
+// Inlining issue
 S32 iSGTgtHaveRoomStartup(st_ISGSESSION* isgdata, S32 tidx, S32 fsize, const char* dpath,
                           const char* fname, S32* bytesNeeded, S32* availOnDisk, S32* needFile)
 {
@@ -1633,6 +1637,7 @@ S32 iSGTgtHaveRoomStartup(st_ISGSESSION* isgdata, S32 tidx, S32 fsize, const cha
     return (count >= 3) ? 0 : is_space;
 }
 
+// Inlining issue
 S32 iSGTgtHaveRoom(st_ISGSESSION* isgdata, S32 tidx, S32 fsize, const char* dpath,
                    const char* fname, S32* bytesNeeded, S32* availOnDisk, S32* needFile)
 {
@@ -1992,6 +1997,7 @@ S32 iSGShutdown()
     return 1;
 }
 
+// Inlining issue
 S32 iSGStartup() // TO-DO - 92%
 {
     if (g_isginit++ != 0)
@@ -2146,6 +2152,7 @@ extern U32 HeapSize;
 extern U32 mem_top_alloc;
 extern U32 mem_base_alloc;
 
+// Inlining issue
 void iMemExit()
 {
     free((void*)gMemInfo.DRAM.addr);
@@ -3335,6 +3342,7 @@ void iEnvEndRenderFX(iEnv*)
     }
 }
 
+// Inlining issue
 void iEnvRender(iEnv* env, bool)
 {
     RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
diff --git a/src/SB/Core/x/xCamera.cpp b/src/SB/Core/x/xCamera.cpp
@@ -385,6 +385,7 @@ static void _xCameraUpdate(xCamera* cam, F32 dt)
     // lol nope
 }
 
+// Inlining issue
 void xCameraUpdate(xCamera* cam, F32 dt)
 {
     S32 i;
diff --git a/src/SB/Core/x/xEnt.h b/src/SB/Core/x/xEnt.h
@@ -232,12 +232,14 @@ void xEntSceneExit();
 void xEntSceneInit();
 void xEntSetTimePassed(F32 sec);
 
-inline void xEntHide(xEnt* ent)
+// Needs to be [gw] but not inline?
+void xEntHide(xEnt* ent)
 {
     ent->flags &= ~0x1;
 }
 
-inline void xEntShow(xEnt* ent)
+// Needs to be [gw] but not inline?
+void xEntShow(xEnt* ent)
 {
     ent->flags |= 0x1;
 }
diff --git a/src/SB/Core/x/xGrid.h b/src/SB/Core/x/xGrid.h
@@ -76,7 +76,7 @@ void xGridCheckPosition(xGrid* grid, xVec3* pos, xQCData* qcd, GridEntCallback h
 S32 xGridEntIsTooBig(xGrid* grid, const xEnt* ent);
 S32 xGridAdd(xGrid* grid, xEnt* ent);
 
-inline xGridBound* xGridIterFirstCell(xGridBound** head, xGridIterator& it)
+xGridBound* xGridIterFirstCell(xGridBound** head, xGridIterator& it)
 {
     xGridBound* cell = *head;
 
@@ -94,7 +94,7 @@ inline xGridBound* xGridIterFirstCell(xGridBound** head, xGridIterator& it)
     return cell;
 }
 
-inline xGridBound* xGridIterFirstCell(xGrid* grid, S32 grx, S32 grz, xGridIterator& iter)
+xGridBound* xGridIterFirstCell(xGrid* grid, S32 grx, S32 grz, xGridIterator& iter)
 {
     if (grx < 0 || grx >= grid->nx)
     {
diff --git a/src/SB/Core/x/xWad1.cpp b/src/SB/Core/x/xWad1.cpp
@@ -1150,6 +1150,7 @@ static en_BIO_ASYNC_ERRCODES AsyncReadStatus(st_FILELOADINFO* fli)
     return BFD_AsyncReadStatus(fli);
 }
 
+// Inlining issue
 static S32 AsyncIRead(st_FILELOADINFO* fli, S32 offset, char* data, S32 size, S32 n)
 {
     return BFD_AsyncRead(fli, offset, data, size, n, LITTLE_ENDIAN);
@@ -1490,6 +1491,7 @@ static S32 BFD_getLength(tag_xFile* bffp, void* xtradata)
     return iFileGetSize(bffp);
 }
 
+// Inlining issue
 st_FILELOADINFO* xBinioLoadCreate(const char* filename, S32)
 {
     st_FILELOADINFO* fli = NULL;
@@ -1844,6 +1846,7 @@ void xAnimPlaySetup(xAnimPlay* play, void* object, xAnimTable* table, xModelInst
     xAnimPlaySetState(play->Single, table->StateList, 0.0f);
 }
 
+// Inlining issue
 xAnimPlay* xAnimPoolAlloc(xMemPool* pool, void* object, xAnimTable* table,
                           xModelInstance* modelInst)
 {
@@ -1919,7 +1922,7 @@ void xAnimPoolCB(xMemPool* pool, void* data)
     clone->Pool = pool;
 }
 
-#define ADD_4_BITS(x) (((x)&1) + (((x) >> 1) & 1) + (((x) >> 2) & 1) + (((x) >> 3) & 1))
+#define ADD_4_BITS(x) (((x) & 1) + (((x) >> 1) & 1) + (((x) >> 2) & 1) + (((x) >> 3) & 1))
 void xAnimPoolInit(xMemPool* pool, U32 count, U32 singles, U32 blendFlags, U32 effectMax)
 {
     effectMax += effectMax & 1;
diff --git a/src/SB/Core/x/xWad2.cpp b/src/SB/Core/x/xWad2.cpp
@@ -1311,6 +1311,7 @@ static void DrawRing(xFXRing* m)
     // todo: uses int-to-float conversion
 }
 
+// Inlining issue
 void xFXRingRender()
 {
     S32 i;
@@ -4711,6 +4712,7 @@ namespace
         ent.pflags = 0x4;
     }
 
+    // Inlining issue
     void drop_stacked_entity(xEnt& ent)
     {
         ent.pflags = 0x4;
@@ -4745,6 +4747,7 @@ namespace
     }
 } // namespace
 
+// Inlining issue
 void xEntUpdate(xEnt* ent, xScene* sc, F32 dt)
 {
     xEntBeginUpdate(ent, sc, dt);
diff --git a/src/SB/Core/x/xWad4.cpp b/src/SB/Core/x/xWad4.cpp
@@ -608,13 +608,15 @@ S32 xSGWriteData(st_XSAVEGAME_DATA* xsgdata, st_XSAVEGAME_WRITECONTEXT* wctxt, c
     return cnt;
 }
 
+// Inlining issue
 S32 xSG_cb_leader_load(void*, st_XSAVEGAME_DATA* original_xsgdata, st_XSAVEGAME_READCONTEXT* rctxt,
                        U32, S32)
 {
     char fundata[32] = {};
     st_XSAVEGAME_LEADER discard = {};
-    xSGReadData(original_xsgdata, rctxt, discard.gameLabel, sizeof(st_XSAVEGAME_LEADER));
-    xSGReadData(original_xsgdata, rctxt, fundata, 0x16);
+    // TODO: Fix last two args in function signature
+    xSGReadData(original_xsgdata, rctxt, discard.gameLabel, 1, sizeof(st_XSAVEGAME_LEADER));
+    xSGReadData(original_xsgdata, rctxt, fundata, 1, 0x16);
     return 1;
 }
 
@@ -631,8 +633,9 @@ S32 xSG_cb_leader_svproc(void* cltdata, st_XSAVEGAME_DATA* original_xsgdata,
     leader.progress = xsg->progress;
     leader.thumbIconIdx = xsg->thumbIconIdx;
 
-    xSGWriteData(original_xsgdata, wctxt, leader.gameLabel, sizeof(st_XSAVEGAME_LEADER));
-    xSGWriteData(original_xsgdata, wctxt, fundata, 0x16);
+    // TODO: Fix last two args in function signature
+    xSGWriteData(original_xsgdata, wctxt, leader.gameLabel, 1, sizeof(st_XSAVEGAME_LEADER));
+    xSGWriteData(original_xsgdata, wctxt, fundata, 1, 0x16);
     return 1;
 }
 
@@ -885,6 +888,7 @@ S32 xSGSetup(st_XSAVEGAME_DATA* xsgdata, S32 gidx, char* label, S32 progress, iT
     return result;
 }
 
+// Inlining issue
 S32 xSGSetup(st_XSAVEGAME_DATA* xsgdata)
 {
     return xSGSetup(xsgdata, 0, "nothing", -1, 0, 0);
@@ -1272,6 +1276,7 @@ S32 xSGDone(st_XSAVEGAME_DATA* xsgdata)
     return result;
 }
 
+// Inlining issue
 st_XSAVEGAME_DATA* xSGInit(en_SAVEGAME_MODE mode)
 {
     st_XSAVEGAME_DATA* xsgdata = &g_xsgdata;
@@ -2476,6 +2481,7 @@ void PKR_ReadDone(st_PACKER_READ_DATA* pr)
     g_loadlock &= ~(1 << lockid);
 }
 
+// Inlining issue
 st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, const char* pkgfile, U32 opts, S32* cltver,
                                   PKRAssetType* typelist, int)
 {
diff --git a/src/SB/Game/zEnv.cpp b/src/SB/Game/zEnv.cpp
@@ -140,6 +140,7 @@ void zEnvInit(_zEnv* env, xEnvAsset* easset)
     }
 }
 
+// Inlining issue
 void zEnvInit(void* env, void* easset)
 {
     zEnvInit((_zEnv*)env, (xEnvAsset*)easset);
diff --git a/src/SB/Game/zNMETypeBossDennis.cpp b/src/SB/Game/zNMETypeBossDennis.cpp
@@ -20,6 +20,7 @@ void zNMEDennis::MeterRender()
 {
 }
 
+// Inlining issue
 void zNMEDennis::RenderHud()
 {
     zNMEDennis::MeterRender();
diff --git a/src/SB/Game/zSaveLoad.cpp b/src/SB/Game/zSaveLoad.cpp
@@ -168,7 +168,6 @@ S32 xSGT_SaveInfoCB(void* vp, st_XSAVEGAME_DATA* xsgdata, S32* need, S32* most)
     return 1;
 }
 
-
 void zSaveLoad_DispatchCB(U32 dispatchEvent, const F32* toParam)
 {
     switch (dispatchEvent)
@@ -1237,6 +1236,7 @@ S32 zSaveLoad_CardCheckSlotEmpty(S32 cardNumber, S32 gameNumber)
     return 1;
 }
 
+// Inlining issue
 S32 zSaveLoad_CardCheckGameSlot(S32 cardNumber, S32 gameNumber, S32 mode)
 {
     if (mode == 1)
@@ -1293,6 +1293,7 @@ S32 zSaveLoad_CardCheckSpace(S32 cardNumber, S32 mode)
     return 1;
 }
 
+// Inlining issue
 S32 zSaveLoad_CardCheckValid(S32 cardNumber, S32 mode)
 {
     if (mode == 1)
diff --git a/src/SB/Game/zTaskBox.cpp b/src/SB/Game/zTaskBox.cpp
diff --git a/src/SB/Game/zUIController.cpp b/src/SB/Game/zUIController.cpp
diff --git a/src/SB/Game/zUIUserString.cpp b/src/SB/Game/zUIUserString.cpp

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,7 @@ static S32 iSG_mc_fclose(st_ISG_MEMCARD_DATA* mcdata)`
`423`	`423`	`return iSG_mc_fclose(mcdata, NULL);`
`424`	`424`	`}`
`425`	`425`
	`426`	`+// Inlining issue`
`426`	`427`	`static S32 iSG_mc_fopen(st_ISG_MEMCARD_DATA* mcdata, const char* fname, S32 fsize,`
`427`	`428`	`en_ISG_IOMODE mode, en_ASYNC_OPERR* operr)`
`428`	`429`	`{`
`@@ -857,6 +858,7 @@ static S32 iSG_bnr_unpack(st_ISG_TPL_TEXPALETTE* tpl)`
`857`	`858`	`return iSG_tpl_unpack(tpl);`
`858`	`859`	`}`
`859`	`860`
	`861`	`+// Inlining issue`
`860`	`862`	`static S32 iSG_load_icondata()`
`861`	`863`	`{`
`862`	`864`	`g_rawicon = (st_ISG_TPL_TEXPALETTE*)iFileLoad("/SBGCIcon.tpl", NULL, &g_iconsize);`
`@@ -1516,6 +1518,7 @@ char* iSGFileModDate(st_ISGSESSION* isgdata, const char* fname, S32* sec, S32* m`
`1516`	`1518`	`return datestr;`
`1517`	`1519`	`}`
`1518`	`1520`
	`1521`	`+// Inlining issue`
`1519`	`1522`	`char* iSGFileModDate(st_ISGSESSION* isgdata, const char* fname)`
`1520`	`1523`	`{`
`1521`	`1524`	`return iSGFileModDate(isgdata, fname, NULL, NULL, NULL, NULL, NULL, NULL);`
`@@ -1559,6 +1562,7 @@ S32 iSGFileSize(st_ISGSESSION* isgdata, const char* fname)`
`1559`	`1562`	`return ret;`
`1560`	`1563`	`}`
`1561`	`1564`
	`1565`	`+// Inlining issue`
`1562`	`1566`	`S32 iSGTgtHaveRoomStartup(st_ISGSESSION* isgdata, S32 tidx, S32 fsize, const char* dpath,`
`1563`	`1567`	`const char* fname, S32* bytesNeeded, S32* availOnDisk, S32* needFile)`
`1564`	`1568`	`{`
`@@ -1633,6 +1637,7 @@ S32 iSGTgtHaveRoomStartup(st_ISGSESSION* isgdata, S32 tidx, S32 fsize, const cha`
`1633`	`1637`	`return (count >= 3) ? 0 : is_space;`
`1634`	`1638`	`}`
`1635`	`1639`
	`1640`	`+// Inlining issue`
`1636`	`1641`	`S32 iSGTgtHaveRoom(st_ISGSESSION* isgdata, S32 tidx, S32 fsize, const char* dpath,`
`1637`	`1642`	`const char* fname, S32* bytesNeeded, S32* availOnDisk, S32* needFile)`
`1638`	`1643`	`{`
`@@ -1992,6 +1997,7 @@ S32 iSGShutdown()`
`1992`	`1997`	`return 1;`
`1993`	`1998`	`}`
`1994`	`1999`
	`2000`	`+// Inlining issue`
`1995`	`2001`	`S32 iSGStartup() // TO-DO - 92%`
`1996`	`2002`	`{`
`1997`	`2003`	`if (g_isginit++ != 0)`
`@@ -2146,6 +2152,7 @@ extern U32 HeapSize;`
`2146`	`2152`	`extern U32 mem_top_alloc;`
`2147`	`2153`	`extern U32 mem_base_alloc;`
`2148`	`2154`
	`2155`	`+// Inlining issue`
`2149`	`2156`	`void iMemExit()`
`2150`	`2157`	`{`
`2151`	`2158`	`free((void*)gMemInfo.DRAM.addr);`
`@@ -3335,6 +3342,7 @@ void iEnvEndRenderFX(iEnv*)`
`3335`	`3342`	`}`
`3336`	`3343`	`}`
`3337`	`3344`
	`3345`	`+// Inlining issue`
`3338`	`3346`	`void iEnvRender(iEnv* env, bool)`
`3339`	`3347`	`{`
`3340`	`3348`	`RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);`
Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,7 @@ static void _xCameraUpdate(xCamera* cam, F32 dt)`
`385`	`385`	`// lol nope`
`386`	`386`	`}`
`387`	`387`
	`388`	`+// Inlining issue`
`388`	`389`	`void xCameraUpdate(xCamera* cam, F32 dt)`
`389`	`390`	`{`
`390`	`391`	`S32 i;`
Original file line number	Diff line number	Diff line change
`@@ -232,12 +232,14 @@ void xEntSceneExit();`
`232`	`232`	`void xEntSceneInit();`
`233`	`233`	`void xEntSetTimePassed(F32 sec);`
`234`	`234`
`235`		`-inline void xEntHide(xEnt* ent)`
	`235`	`+// Needs to be [gw] but not inline?`
	`236`	`+void xEntHide(xEnt* ent)`
`236`	`237`	`{`
`237`	`238`	`ent->flags &= ~0x1;`
`238`	`239`	`}`
`239`	`240`
`240`		`-inline void xEntShow(xEnt* ent)`
	`241`	`+// Needs to be [gw] but not inline?`
	`242`	`+void xEntShow(xEnt* ent)`
`241`	`243`	`{`
`242`	`244`	`ent->flags \|= 0x1;`
`243`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ void xGridCheckPosition(xGrid* grid, xVec3* pos, xQCData* qcd, GridEntCallback h`
`76`	`76`	`S32 xGridEntIsTooBig(xGrid* grid, const xEnt* ent);`
`77`	`77`	`S32 xGridAdd(xGrid* grid, xEnt* ent);`
`78`	`78`
`79`		`-inline xGridBound* xGridIterFirstCell(xGridBound** head, xGridIterator& it)`
	`79`	`+xGridBound* xGridIterFirstCell(xGridBound** head, xGridIterator& it)`
`80`	`80`	`{`
`81`	`81`	`xGridBound* cell = *head;`
`82`	`82`
`@@ -94,7 +94,7 @@ inline xGridBound* xGridIterFirstCell(xGridBound** head, xGridIterator& it)`
`94`	`94`	`return cell;`
`95`	`95`	`}`
`96`	`96`
`97`		`-inline xGridBound* xGridIterFirstCell(xGrid* grid, S32 grx, S32 grz, xGridIterator& iter)`
	`97`	`+xGridBound* xGridIterFirstCell(xGrid* grid, S32 grx, S32 grz, xGridIterator& iter)`
`98`	`98`	`{`
`99`	`99`	`if (grx < 0 \|\| grx >= grid->nx)`
`100`	`100`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1150,6 +1150,7 @@ static en_BIO_ASYNC_ERRCODES AsyncReadStatus(st_FILELOADINFO* fli)`
`1150`	`1150`	`return BFD_AsyncReadStatus(fli);`
`1151`	`1151`	`}`
`1152`	`1152`
	`1153`	`+// Inlining issue`
`1153`	`1154`	`static S32 AsyncIRead(st_FILELOADINFO* fli, S32 offset, char* data, S32 size, S32 n)`
`1154`	`1155`	`{`
`1155`	`1156`	`return BFD_AsyncRead(fli, offset, data, size, n, LITTLE_ENDIAN);`
`@@ -1490,6 +1491,7 @@ static S32 BFD_getLength(tag_xFile* bffp, void* xtradata)`
`1490`	`1491`	`return iFileGetSize(bffp);`
`1491`	`1492`	`}`
`1492`	`1493`
	`1494`	`+// Inlining issue`
`1493`	`1495`	`st_FILELOADINFO* xBinioLoadCreate(const char* filename, S32)`
`1494`	`1496`	`{`
`1495`	`1497`	`st_FILELOADINFO* fli = NULL;`
`@@ -1844,6 +1846,7 @@ void xAnimPlaySetup(xAnimPlay* play, void* object, xAnimTable* table, xModelInst`
`1844`	`1846`	`xAnimPlaySetState(play->Single, table->StateList, 0.0f);`
`1845`	`1847`	`}`
`1846`	`1848`
	`1849`	`+// Inlining issue`
`1847`	`1850`	`xAnimPlay* xAnimPoolAlloc(xMemPool* pool, void* object, xAnimTable* table,`
`1848`	`1851`	`xModelInstance* modelInst)`
`1849`	`1852`	`{`
`@@ -1919,7 +1922,7 @@ void xAnimPoolCB(xMemPool* pool, void* data)`
`1919`	`1922`	`clone->Pool = pool;`
`1920`	`1923`	`}`
`1921`	`1924`
`1922`		`-#define ADD_4_BITS(x) (((x)&1) + (((x) >> 1) & 1) + (((x) >> 2) & 1) + (((x) >> 3) & 1))`
	`1925`	`+#define ADD_4_BITS(x) (((x) & 1) + (((x) >> 1) & 1) + (((x) >> 2) & 1) + (((x) >> 3) & 1))`
`1923`	`1926`	`void xAnimPoolInit(xMemPool* pool, U32 count, U32 singles, U32 blendFlags, U32 effectMax)`
`1924`	`1927`	`{`
`1925`	`1928`	`effectMax += effectMax & 1;`
Original file line number	Diff line number	Diff line change
`@@ -1311,6 +1311,7 @@ static void DrawRing(xFXRing* m)`
`1311`	`1311`	`// todo: uses int-to-float conversion`
`1312`	`1312`	`}`
`1313`	`1313`
	`1314`	`+// Inlining issue`
`1314`	`1315`	`void xFXRingRender()`
`1315`	`1316`	`{`
`1316`	`1317`	`S32 i;`
`@@ -4711,6 +4712,7 @@ namespace`
`4711`	`4712`	`ent.pflags = 0x4;`
`4712`	`4713`	`}`
`4713`	`4714`
	`4715`	`+ // Inlining issue`
`4714`	`4716`	`void drop_stacked_entity(xEnt& ent)`
`4715`	`4717`	`{`
`4716`	`4718`	`ent.pflags = 0x4;`
`@@ -4745,6 +4747,7 @@ namespace`
`4745`	`4747`	`}`
`4746`	`4748`	`} // namespace`
`4747`	`4749`
	`4750`	`+// Inlining issue`
`4748`	`4751`	`void xEntUpdate(xEnt* ent, xScene* sc, F32 dt)`
`4749`	`4752`	`{`
`4750`	`4753`	`xEntBeginUpdate(ent, sc, dt);`
Original file line number	Diff line number	Diff line change
`@@ -608,13 +608,15 @@ S32 xSGWriteData(st_XSAVEGAME_DATA* xsgdata, st_XSAVEGAME_WRITECONTEXT* wctxt, c`
`608`	`608`	`return cnt;`
`609`	`609`	`}`
`610`	`610`
	`611`	`+// Inlining issue`
`611`	`612`	`S32 xSG_cb_leader_load(void, st_XSAVEGAME_DATA original_xsgdata, st_XSAVEGAME_READCONTEXT* rctxt,`
`612`	`613`	`U32, S32)`
`613`	`614`	`{`
`614`	`615`	`char fundata[32] = {};`
`615`	`616`	`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);`
`618`	`620`	`return 1;`
`619`	`621`	`}`
`620`	`622`
`@@ -631,8 +633,9 @@ S32 xSG_cb_leader_svproc(void* cltdata, st_XSAVEGAME_DATA* original_xsgdata,`
`631`	`633`	`leader.progress = xsg->progress;`
`632`	`634`	`leader.thumbIconIdx = xsg->thumbIconIdx;`
`633`	`635`
`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);`
`636`	`639`	`return 1;`
`637`	`640`	`}`
`638`	`641`
`@@ -885,6 +888,7 @@ S32 xSGSetup(st_XSAVEGAME_DATA* xsgdata, S32 gidx, char* label, S32 progress, iT`
`885`	`888`	`return result;`
`886`	`889`	`}`
`887`	`890`
	`891`	`+// Inlining issue`
`888`	`892`	`S32 xSGSetup(st_XSAVEGAME_DATA* xsgdata)`
`889`	`893`	`{`
`890`	`894`	`return xSGSetup(xsgdata, 0, "nothing", -1, 0, 0);`
`@@ -1272,6 +1276,7 @@ S32 xSGDone(st_XSAVEGAME_DATA* xsgdata)`
`1272`	`1276`	`return result;`
`1273`	`1277`	`}`
`1274`	`1278`
	`1279`	`+// Inlining issue`
`1275`	`1280`	`st_XSAVEGAME_DATA* xSGInit(en_SAVEGAME_MODE mode)`
`1276`	`1281`	`{`
`1277`	`1282`	`st_XSAVEGAME_DATA* xsgdata = &g_xsgdata;`
`@@ -2476,6 +2481,7 @@ void PKR_ReadDone(st_PACKER_READ_DATA* pr)`
`2476`	`2481`	`g_loadlock &= ~(1 << lockid);`
`2477`	`2482`	`}`
`2478`	`2483`
	`2484`	`+// Inlining issue`
`2479`	`2485`	`st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, const char* pkgfile, U32 opts, S32* cltver,`
`2480`	`2486`	`PKRAssetType* typelist, int)`
`2481`	`2487`	`{`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ void zEnvInit(_zEnv* env, xEnvAsset* easset)`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
	`143`	`+// Inlining issue`
`143`	`144`	`void zEnvInit(void* env, void* easset)`
`144`	`145`	`{`
`145`	`146`	`zEnvInit((_zEnv)env, (xEnvAsset)easset);`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ void zNMEDennis::MeterRender()`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
	`23`	`+// Inlining issue`
`23`	`24`	`void zNMEDennis::RenderHud()`
`24`	`25`	`{`
`25`	`26`	`zNMEDennis::MeterRender();`