Skip to content

Fix crash when requesting CJ clothing model #4419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2025
Merged

Fix crash when requesting CJ clothing model #4419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions Client/game_sa/CRenderWareSA.ClothesReplacing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,22 +219,26 @@ __declspec(noinline) bool _cdecl OnCStreaming_RequestModel_Mid(int flags, SImgGT
if (ms_ReplacementClothesFileDataMap.empty() && ms_ClothesFileDataMap.empty())
return false;

// Initialze lookup map if needed
static std::map<std::uint32_t, int> blockOffsetToFileIdMap;
static std::map<std::uint32_t, std::string> blockOffsetToFileNameMap;
if (blockOffsetToFileIdMap.empty())
static std::map<std::uint32_t, int> blockOffsetToFileIdMap;
std::map<std::uint32_t, std::string> blockOffsetToFileNameMap;

if (blockOffsetToFileIdMap.empty() || ms_ClothesFileDataMap.size() > 0)
{
// Check is player.img dir has been loaded by GTA
SPlayerImgItemArray* pItemArray = (SPlayerImgItemArray*)0x00BC12C0;
std::uint32_t maxArraySize = 542 + ms_ClothesFileDataMap.size();
std::uint32_t defaultArraySize = 542;
std::uint32_t maxArraySize = defaultArraySize + ms_ClothesFileDataMap.size();

if (!pItemArray->pItems || pItemArray->uiArraySize != maxArraySize)
return false;

for (std::uint32_t i = 0; i < pItemArray->uiArraySize; i++)
{
SPlayerImgItem* pImgItem = &pItemArray->pItems[i];
MapSet(blockOffsetToFileIdMap, pImgItem->uiBlockOffset, i);

if (i < defaultArraySize)
MapSet(blockOffsetToFileIdMap, pImgItem->uiBlockOffset, i);

MapSet(blockOffsetToFileNameMap, pImgItem->uiBlockOffset, pImgItem->szName);
}
}
Expand Down
Loading