From 950bf8753410af423d59494ceaf94529d3a3e12f Mon Sep 17 00:00:00 2001 From: Josh Sanchez Date: Sat, 15 Mar 2025 00:35:45 -0500 Subject: [PATCH 1/4] xpkrsvc: Initialize g_pkr_read_funcmap_original and g_pkr_read_funcmap --- src/SB/Core/x/xpkrsvc.cpp | 9 +++++++-- src/SB/Core/x/xpkrsvc.h | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/SB/Core/x/xpkrsvc.cpp b/src/SB/Core/x/xpkrsvc.cpp index 2a977a49e..0e82ffd49 100644 --- a/src/SB/Core/x/xpkrsvc.cpp +++ b/src/SB/Core/x/xpkrsvc.cpp @@ -11,8 +11,13 @@ extern char xpkrsvc_strings[]; -extern st_PACKER_READ_FUNCS g_pkr_read_funcmap_original; -extern st_PACKER_READ_FUNCS g_pkr_read_funcmap; // = g_pkr_read_funcmap_original; +static st_PACKER_READ_FUNCS g_pkr_read_funcmap_original = { + 1, + PKR_ReadInit, PKR_ReadDone, PKR_LoadLayer, PKR_GetAssetSize, PKR_LoadAsset, PKR_AssetByType, + PKR_AssetCount, PKR_IsAssetReady, PKR_SetActive, PKR_AssetName, PKR_GetBaseSector, PKR_GetAssetInfo, + PKR_GetAssetInfoByType, PKR_PkgHasAsset, PKR_getPackTimestamp, PKR_Disconnect +}; +static st_PACKER_READ_FUNCS g_pkr_read_funcmap = g_pkr_read_funcmap_original; st_PACKER_READ_DATA g_readdatainst[16] = {}; st_HIPLOADFUNCS* g_hiprf; diff --git a/src/SB/Core/x/xpkrsvc.h b/src/SB/Core/x/xpkrsvc.h index 3ad4dff45..47796963f 100644 --- a/src/SB/Core/x/xpkrsvc.h +++ b/src/SB/Core/x/xpkrsvc.h @@ -136,7 +136,7 @@ struct st_PACKER_READ_FUNCS char* (*AssetName)(st_PACKER_READ_DATA*, U32); U32 (*GetBaseSector)(st_PACKER_READ_DATA*); S32 (*GetAssetInfo)(st_PACKER_READ_DATA*, U32, st_PKR_ASSET_TOCINFO*); - S32 (*GetAssetInfoByType)(st_PACKER_READ_DATA*, U32, S32, const st_PKR_ASSET_TOCINFO*); + S32 (*GetAssetInfoByType)(st_PACKER_READ_DATA*, U32, S32, st_PKR_ASSET_TOCINFO*); S32 (*PkgHasAsset)(st_PACKER_READ_DATA*, U32); U32 (*PkgTimeStamp)(st_PACKER_READ_DATA*); void (*PkgDisconnect)(st_PACKER_READ_DATA*); @@ -146,7 +146,7 @@ st_PACKER_READ_FUNCS* PKRGetReadFuncs(S32 apiver); S32 PKRStartup(); S32 PKRShutdown(); S32 PKRLoadStep(S32); -st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, char* pkgfile, U32 opts, S32* cltver, +st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, const char* pkgfile, U32 opts, S32* cltver, st_PACKER_ASSETTYPE* typelist); void PKR_ReadDone(st_PACKER_READ_DATA* pr); S32 PKR_SetActive(st_PACKER_READ_DATA* pr, en_LAYER_TYPE layer); @@ -164,7 +164,7 @@ void PKR_xformLayerAssets(st_PACKER_LTOC_NODE* laynode); void PKR_xform_asset(st_PACKER_ATOC_NODE* assnode, S32 dumpable_layer); void* PKR_FindAsset(st_PACKER_READ_DATA* pr, U32 aid); S32 PKR_LoadLayer(st_PACKER_READ_DATA* pr, en_LAYER_TYPE layer); -void* PKR_LoadAsset(st_PACKER_READ_DATA* pr, U32 aid, const char*, void*); +void* PKR_LoadAsset(st_PACKER_READ_DATA* pr, U32 aid, char*, void*); U32 PKR_GetAssetSize(st_PACKER_READ_DATA* pr, U32 aid); S32 PKR_AssetCount(st_PACKER_READ_DATA* pr, U32 type); void* PKR_AssetByType(st_PACKER_READ_DATA* pr, U32 type, S32 idx, U32* size); From e7dd4befd468859ed55a515f46304389ec528511 Mon Sep 17 00:00:00 2001 From: Josh Sanchez Date: Sat, 15 Mar 2025 00:36:10 -0500 Subject: [PATCH 2/4] xpkrsvc: Free nearly matching functions that were not 100% matches --- src/SB/Core/x/xpkrsvc.cpp | 52 +++------------------------------------ 1 file changed, 3 insertions(+), 49 deletions(-) diff --git a/src/SB/Core/x/xpkrsvc.cpp b/src/SB/Core/x/xpkrsvc.cpp index 0e82ffd49..4eb2314a3 100644 --- a/src/SB/Core/x/xpkrsvc.cpp +++ b/src/SB/Core/x/xpkrsvc.cpp @@ -39,8 +39,6 @@ st_PACKER_READ_FUNCS* PKRGetReadFuncs(S32 apiver) } } -#ifdef NON_MATCHING -// Small reordering S32 PKRStartup() { if (g_packinit++ == 0) @@ -51,7 +49,6 @@ S32 PKRStartup() } return g_packinit; } -#endif S32 PKRShutdown() { @@ -64,7 +61,7 @@ S32 PKRLoadStep(S32) return PKR_LoadStep_Async(); } -st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, char* pkgfile, U32 opts, S32* cltver, +st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, const char* pkgfile, U32 opts, S32* cltver, st_PACKER_ASSETTYPE* typelist) { // I'm pretty sure this is just a pointer to an array on the heap @@ -200,8 +197,6 @@ void PKR_ReadDone(st_PACKER_READ_DATA* pr) g_loadlock &= ~(1 << lockid); } -#ifdef NON_MATCHING -// Incorrect (but equivalent) logic for comparing the loadflag S32 PKR_SetActive(st_PACKER_READ_DATA* pr, en_LAYER_TYPE layer) { S32 result; @@ -254,7 +249,6 @@ S32 PKR_SetActive(st_PACKER_READ_DATA* pr, en_LAYER_TYPE layer) return rc; } -#endif S32 PKR_parse_TOC(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { @@ -512,8 +506,6 @@ S32 PKR_layerTypeNeedsXForm(en_LAYER_TYPE layer) } } -#ifdef NON_MATCHING -//Regalloc S32 PKR_findNextLayerToLoad(st_PACKER_READ_DATA** work_on_pkg, st_PACKER_LTOC_NODE** next_layer) { st_PACKER_READ_DATA* tmppr; @@ -565,10 +557,7 @@ S32 PKR_findNextLayerToLoad(st_PACKER_READ_DATA** work_on_pkg, st_PACKER_LTOC_NO return *next_layer != NULL; } -#endif -#ifdef NON_MATCHING -//Regalloc void PKR_updateLayerAssets(st_PACKER_LTOC_NODE* laynode) { st_PACKER_ATOC_NODE* tmpass = NULL; @@ -605,7 +594,6 @@ void PKR_updateLayerAssets(st_PACKER_LTOC_NODE* laynode) } } } -#endif void PKR_xformLayerAssets(st_PACKER_LTOC_NODE* laynode) { @@ -633,7 +621,6 @@ void PKR_xformLayerAssets(st_PACKER_LTOC_NODE* laynode) } } -// void PKR_xform_asset(st_PACKER_ATOC_NODE* assnode, S32 dumpable_layer) { if (!(assnode->infoflag & 4)) @@ -718,7 +705,7 @@ S32 PKR_LoadLayer(st_PACKER_READ_DATA* pr, en_LAYER_TYPE layer) return 0; } -void* PKR_LoadAsset(st_PACKER_READ_DATA* pr, U32 aid, const char*, void*) +void* PKR_LoadAsset(st_PACKER_READ_DATA* pr, U32 aid, char*, void*) { return PKR_FindAsset(pr, aid); } @@ -878,7 +865,7 @@ S32 PKR_GetAssetInfo(st_PACKER_READ_DATA* pr, U32 aid, st_PKR_ASSET_TOCINFO* toc } S32 PKR_GetAssetInfoByType(st_PACKER_READ_DATA* pr, U32 type, S32 idx, - st_PKR_ASSET_TOCINFO* tocainfo) + st_PKR_ASSET_TOCINFO* tocainfo) { memset(tocainfo, 0, sizeof(st_PKR_ASSET_TOCINFO)); if (idx < 0) @@ -1121,8 +1108,6 @@ S32 LOD_r_PACK(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) return 1; } -#ifdef NON_MATCHING -// reordering S32 LOD_r_PVER(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { S32 ver = 0; @@ -1151,17 +1136,13 @@ S32 LOD_r_PVER(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) } return 1; } -#endif -#ifdef NON_MATCHING -// reordering S32 LOD_r_PFLG(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { S32 flg = 0; g_hiprf->readLongs(pkg, &flg, 1); return 1; } -#endif S32 LOD_r_PCNT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { @@ -1176,8 +1157,6 @@ S32 LOD_r_PCNT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) return 1; } -#ifdef NON_MATCHING -// need all of .rodata to generate for the OK S32 LOD_r_PCRT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { S32 time = 0; @@ -1192,7 +1171,6 @@ S32 LOD_r_PCRT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) } return 1; } -#endif S32 LOD_r_PMOD(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { @@ -1202,8 +1180,6 @@ S32 LOD_r_PMOD(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) return 1; } -#ifdef NON_MATCHING -// String data S32 ValidatePlatform(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr, S32 plattag, char* plat, char* vid, char* lang, char* title) { @@ -1278,10 +1254,7 @@ S32 ValidatePlatform(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr, S32 plattag, } return 1; } -#endif -#ifdef NON_MATCHING -// Orderings and Regalloc S32 LOD_r_PLAT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { S32 result = 1; @@ -1305,7 +1278,6 @@ S32 LOD_r_PLAT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) } return result; } -#endif S32 LOD_r_DICT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { @@ -1349,15 +1321,12 @@ S32 LOD_r_ATOC(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) return 1; } -#ifdef NON_MATCHING -// reordering S32 LOD_r_AINF(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { S32 ival = 0; g_hiprf->readLongs(pkg, &ival, 1); return 1; } -#endif S32 LOD_r_AHDR(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { @@ -1412,8 +1381,6 @@ S32 LOD_r_AHDR(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) return 1; } -#ifdef NON_MATCHING -// uses reordering and uses .rodata S32 LOD_r_ADBG(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr, st_PACKER_ATOC_NODE* assnode) { S32 ival = 0; @@ -1435,7 +1402,6 @@ S32 LOD_r_ADBG(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr, st_PACKER_ATOC_NODE return 1; } -#endif S32 LOD_r_LTOC(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { @@ -1457,18 +1423,13 @@ S32 LOD_r_LTOC(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) return 1; } -#ifdef NON_MATCHING -// reordering S32 LOD_r_LINF(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { S32 ival = 0; g_hiprf->readLongs(pkg, &ival, 1); return 1; } -#endif -#ifdef NON_MATCHING -// reordering S32 LOD_r_LHDR(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { S32 i; @@ -1517,7 +1478,6 @@ S32 LOD_r_LHDR(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) } return 1; } -#endif S32 LOD_r_LDBG(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr, st_PACKER_LTOC_NODE* laynode) { @@ -1550,15 +1510,12 @@ S32 LOD_r_STRM(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) return 1; } -#ifdef NON_MATCHING -// reordering S32 LOD_r_DHDR(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { S32 ivar = 0; g_hiprf->readLongs(pkg, &ivar, 1); return 1; } -#endif S32 LOD_r_DPAK(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) { @@ -1590,8 +1547,6 @@ st_PACKER_ASSETTYPE* PKR_type2typeref(U32 asstype, st_PACKER_ASSETTYPE* types) return da_type; } -#if 0 -// Probably func match, weird regalloc void PKR_bld_typecnt(st_PACKER_READ_DATA* pr) { st_PACKER_LTOC_NODE* laynode; @@ -1679,7 +1634,6 @@ void PKR_bld_typecnt(st_PACKER_READ_DATA* pr) } } } -#endif S32 PKR_typeHdlr_idx(st_PACKER_READ_DATA* pr, U32 type) { From c63dfd807c7186f63b20d8b08ee6888b44d6d705 Mon Sep 17 00:00:00 2001 From: Josh Sanchez Date: Sat, 15 Mar 2025 01:11:10 -0500 Subject: [PATCH 3/4] xpkrsvc: Remove const keyword from char arguments based on PS2 DWARF data --- src/SB/Core/x/xpkrsvc.cpp | 2 +- src/SB/Core/x/xpkrsvc.h | 4 ++-- src/SB/Core/x/xstransvc.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SB/Core/x/xpkrsvc.cpp b/src/SB/Core/x/xpkrsvc.cpp index 4eb2314a3..550516280 100644 --- a/src/SB/Core/x/xpkrsvc.cpp +++ b/src/SB/Core/x/xpkrsvc.cpp @@ -61,7 +61,7 @@ S32 PKRLoadStep(S32) return PKR_LoadStep_Async(); } -st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, const char* pkgfile, U32 opts, S32* cltver, +st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, char* pkgfile, U32 opts, S32* cltver, st_PACKER_ASSETTYPE* typelist) { // I'm pretty sure this is just a pointer to an array on the heap diff --git a/src/SB/Core/x/xpkrsvc.h b/src/SB/Core/x/xpkrsvc.h index 47796963f..9db155723 100644 --- a/src/SB/Core/x/xpkrsvc.h +++ b/src/SB/Core/x/xpkrsvc.h @@ -124,7 +124,7 @@ struct st_PACKER_READ_DATA struct st_PACKER_READ_FUNCS { U32 api_ver; - st_PACKER_READ_DATA* (*Init)(void*, const char*, U32, S32*, st_PACKER_ASSETTYPE*); + st_PACKER_READ_DATA* (*Init)(void*, char*, U32, S32*, st_PACKER_ASSETTYPE*); void (*Done)(st_PACKER_READ_DATA*); S32 (*LoadLayer)(st_PACKER_READ_DATA*, en_LAYER_TYPE); U32 (*GetAssetSize)(st_PACKER_READ_DATA*, U32); @@ -146,7 +146,7 @@ st_PACKER_READ_FUNCS* PKRGetReadFuncs(S32 apiver); S32 PKRStartup(); S32 PKRShutdown(); S32 PKRLoadStep(S32); -st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, const char* pkgfile, U32 opts, S32* cltver, +st_PACKER_READ_DATA* PKR_ReadInit(void* userdata, char* pkgfile, U32 opts, S32* cltver, st_PACKER_ASSETTYPE* typelist); void PKR_ReadDone(st_PACKER_READ_DATA* pr); S32 PKR_SetActive(st_PACKER_READ_DATA* pr, en_LAYER_TYPE layer); diff --git a/src/SB/Core/x/xstransvc.cpp b/src/SB/Core/x/xstransvc.cpp index d1babe4d2..7d36066c3 100644 --- a/src/SB/Core/x/xstransvc.cpp +++ b/src/SB/Core/x/xstransvc.cpp @@ -360,7 +360,7 @@ S32 xSTGetAssetInfoByType(U32 type, S32 idx, st_PKR_ASSET_TOCINFO* ainfo) { S32 rc = 0; S32 sum = 0; - const st_PKR_ASSET_TOCINFO tocinfo = { 0, NULL, 0, 0, 0, NULL }; + st_PKR_ASSET_TOCINFO tocinfo = { 0, NULL, 0, 0, 0, NULL }; memset(ainfo, 0, sizeof(st_PKR_ASSET_TOCINFO)); S32 found = XST_cnt_locked(); @@ -438,7 +438,7 @@ char* xST_xAssetID_HIPFullPath(U32 aid, U32* sceneID) static S32 XST_PreLoadScene(st_STRAN_SCENE* sdata, const char* name) { S32 buf = 0; - st_PACKER_READ_DATA* spkg = g_pkrf->Init(sdata->userdata, name, 0x2e, &buf, g_typeHandlers); + st_PACKER_READ_DATA* spkg = g_pkrf->Init(sdata->userdata, (char*) name, 0x2e, &buf, g_typeHandlers); sdata->spkg = spkg; if (sdata->spkg != NULL) { From 09ad5f917615b48d6fbed0f49f5863adf32eb82b Mon Sep 17 00:00:00 2001 From: Josh Sanchez Date: Sat, 15 Mar 2025 01:32:22 -0500 Subject: [PATCH 4/4] Clang-format pass on xpkrsvc and xstransvc --- src/SB/Core/x/xpkrsvc.cpp | 35 ++++++++++++++++++++++++----------- src/SB/Core/x/xpkrsvc.h | 8 ++++---- src/SB/Core/x/xstransvc.cpp | 5 +++-- src/SB/Core/x/xstransvc.h | 1 - 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/SB/Core/x/xpkrsvc.cpp b/src/SB/Core/x/xpkrsvc.cpp index 550516280..12b7d381b 100644 --- a/src/SB/Core/x/xpkrsvc.cpp +++ b/src/SB/Core/x/xpkrsvc.cpp @@ -11,12 +11,25 @@ extern char xpkrsvc_strings[]; -static st_PACKER_READ_FUNCS g_pkr_read_funcmap_original = { - 1, - PKR_ReadInit, PKR_ReadDone, PKR_LoadLayer, PKR_GetAssetSize, PKR_LoadAsset, PKR_AssetByType, - PKR_AssetCount, PKR_IsAssetReady, PKR_SetActive, PKR_AssetName, PKR_GetBaseSector, PKR_GetAssetInfo, - PKR_GetAssetInfoByType, PKR_PkgHasAsset, PKR_getPackTimestamp, PKR_Disconnect -}; +// Square and JESway: Function relocation issues will resolve themselves when all the functions +// here 100% match, as it is apparently related to the instruction size of each function +static st_PACKER_READ_FUNCS g_pkr_read_funcmap_original = { 1, + PKR_ReadInit, + PKR_ReadDone, + PKR_LoadLayer, + PKR_GetAssetSize, + PKR_LoadAsset, + PKR_AssetByType, + PKR_AssetCount, + PKR_IsAssetReady, + PKR_SetActive, + PKR_AssetName, + PKR_GetBaseSector, + PKR_GetAssetInfo, + PKR_GetAssetInfoByType, + PKR_PkgHasAsset, + PKR_getPackTimestamp, + PKR_Disconnect }; static st_PACKER_READ_FUNCS g_pkr_read_funcmap = g_pkr_read_funcmap_original; st_PACKER_READ_DATA g_readdatainst[16] = {}; @@ -865,7 +878,7 @@ S32 PKR_GetAssetInfo(st_PACKER_READ_DATA* pr, U32 aid, st_PKR_ASSET_TOCINFO* toc } S32 PKR_GetAssetInfoByType(st_PACKER_READ_DATA* pr, U32 type, S32 idx, - st_PKR_ASSET_TOCINFO* tocainfo) + st_PKR_ASSET_TOCINFO* tocainfo) { memset(tocainfo, 0, sizeof(st_PKR_ASSET_TOCINFO)); if (idx < 0) @@ -917,8 +930,8 @@ S32 PKR_PkgHasAsset(st_PACKER_READ_DATA* pr, U32 aid) return rc; } -S32 PKR_FRIEND_assetIsGameDup(U32 aid, const st_PACKER_READ_DATA* skippr, S32 oursize, - U32 ourtype, U32 chksum, char*) +S32 PKR_FRIEND_assetIsGameDup(U32 aid, const st_PACKER_READ_DATA* skippr, S32 oursize, U32 ourtype, + U32 chksum, char*) { S32 is_dup = 0; if (aid == 0x7ab6743a) @@ -1181,7 +1194,7 @@ S32 LOD_r_PMOD(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) } S32 ValidatePlatform(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr, S32 plattag, char* plat, - char* vid, char* lang, char* title) + char* vid, char* lang, char* title) { char fullname[128] = {}; sprintf(fullname, "%s %s %s %s", plat, vid, lang, title); @@ -1373,7 +1386,7 @@ S32 LOD_r_AHDR(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr) } S32 isdup = PKR_FRIEND_assetIsGameDup(assnode->aid, pr, assnode->d_size, assnode->asstype, - assnode->d_chksum, NULL); + assnode->d_chksum, NULL); if (isdup) { assnode->loadflag |= 0x100000; diff --git a/src/SB/Core/x/xpkrsvc.h b/src/SB/Core/x/xpkrsvc.h index 9db155723..7b25e75e0 100644 --- a/src/SB/Core/x/xpkrsvc.h +++ b/src/SB/Core/x/xpkrsvc.h @@ -176,10 +176,10 @@ char* PKR_AssetName(st_PACKER_READ_DATA* pr, U32 aid); U32 PKR_GetBaseSector(st_PACKER_READ_DATA* pr); S32 PKR_GetAssetInfo(st_PACKER_READ_DATA* pr, U32 aid, st_PKR_ASSET_TOCINFO* tocainfo); S32 PKR_GetAssetInfoByType(st_PACKER_READ_DATA* pr, U32 type, S32 idx, - st_PKR_ASSET_TOCINFO* tocainfo); + st_PKR_ASSET_TOCINFO* tocainfo); S32 PKR_PkgHasAsset(st_PACKER_READ_DATA* pr, U32 aid); -S32 PKR_FRIEND_assetIsGameDup(U32 aid, const st_PACKER_READ_DATA* skippr, S32 oursize, - U32 ourtype, U32 chksum, char*); +S32 PKR_FRIEND_assetIsGameDup(U32 aid, const st_PACKER_READ_DATA* skippr, S32 oursize, U32 ourtype, + U32 chksum, char*); S32 PKR_makepool_anode(st_PACKER_READ_DATA* pr, S32 cnt); void PKR_kiilpool_anode(st_PACKER_READ_DATA* pr); st_PACKER_ATOC_NODE* PKR_newassnode(st_PACKER_READ_DATA* pr, U32 aid); @@ -195,7 +195,7 @@ S32 LOD_r_PCNT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr); S32 LOD_r_PCRT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr); S32 LOD_r_PMOD(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr); S32 ValidatePlatform(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr, S32 plattag, char* plat, - char* vid, char* lang, char* title); + char* vid, char* lang, char* title); S32 LOD_r_PLAT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr); S32 LOD_r_DICT(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr); S32 LOD_r_ATOC(st_HIPLOADDATA* pkg, st_PACKER_READ_DATA* pr); diff --git a/src/SB/Core/x/xstransvc.cpp b/src/SB/Core/x/xstransvc.cpp index 7d36066c3..aebb69269 100644 --- a/src/SB/Core/x/xstransvc.cpp +++ b/src/SB/Core/x/xstransvc.cpp @@ -382,7 +382,7 @@ S32 xSTGetAssetInfoByType(U32 type, S32 idx, st_PKR_ASSET_TOCINFO* ainfo) break; } } - sum += cnt; + sum += cnt; } return rc; @@ -438,7 +438,8 @@ char* xST_xAssetID_HIPFullPath(U32 aid, U32* sceneID) static S32 XST_PreLoadScene(st_STRAN_SCENE* sdata, const char* name) { S32 buf = 0; - st_PACKER_READ_DATA* spkg = g_pkrf->Init(sdata->userdata, (char*) name, 0x2e, &buf, g_typeHandlers); + st_PACKER_READ_DATA* spkg = + g_pkrf->Init(sdata->userdata, (char*)name, 0x2e, &buf, g_typeHandlers); sdata->spkg = spkg; if (sdata->spkg != NULL) { diff --git a/src/SB/Core/x/xstransvc.h b/src/SB/Core/x/xstransvc.h index d9930930e..889a9e8ec 100644 --- a/src/SB/Core/x/xstransvc.h +++ b/src/SB/Core/x/xstransvc.h @@ -13,7 +13,6 @@ struct st_STRAN_SCENE char fnam[256]; }; - struct st_STRAN_DATA { st_STRAN_SCENE hipscn[16];