Skip to content

Commit 96387a3

Browse files
saml1ercodenulls
andauthored
Fix #1617: Vehicle DFF leak fix disabled (#1623)
* Fix 1617: Vehicle DFF leak fix disabled * Improve code comments Co-authored-by: saml1er <[email protected]>
1 parent c174c73 commit 96387a3

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Client/game_sa/CRenderWareSA.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,8 @@ void CRenderWareSA::ReplaceModel(RpClump* pNew, unsigned short usModelID, DWORD
391391

392392
// CClumpModelInfo::SetClump will increment CTxdStore reference count.
393393
// We must remove it again to avoid TXD leaks.
394-
CTxdStore_RemoveRef(pModelInfoInterface->usTextureDictionary);
394+
// UPDATE: This is disabled due to a crash reported in issue #1617
395+
// CTxdStore_RemoveRef(pModelInfoInterface->usTextureDictionary);
395396
RpClumpDestroy(pOldClump);
396397
}
397398
}

Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,8 @@ int CLuaEngineDefs::EngineReplaceModel(lua_State* luaVM)
513513
ushort usModelID = CModelNames::ResolveModelID(strModelName);
514514
if (usModelID != INVALID_MODEL_ID)
515515
{
516-
m_pDFFManager->RestoreModel(usModelID);
516+
// This is disabled due to a crash reported in issue #1617
517+
// m_pDFFManager->RestoreModel(usModelID);
517518
if (pDFF->ReplaceModel(usModelID, bAlphaTransparency))
518519
{
519520
lua_pushboolean(luaVM, true);

0 commit comments

Comments
 (0)