Skip to content

Commit 8580069

Browse files
committed
Addendum to d413e81: Fix additional cause of 'white textures'
1 parent 6bd6db5 commit 8580069

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

Client/game_sa/CRenderWareSA.TextureReplacing.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2162,6 +2162,7 @@ namespace
21622162
auto* slot = pTxdPoolSA->GetTextureDictonarySlot(existingTxdId);
21632163
if (slot && slot->rwTexDictonary && slot->usParentIndex == usParentTxdId)
21642164
{
2165+
itExisting->second.bNeedsVehicleFallback = ShouldUseVehicleTxdFallback(usModelId);
21652166
g_IsolatedModelByTxd[existingTxdId] = usModelId;
21662167
if (pModelInfo->GetTextureDictionaryID() != existingTxdId)
21672168
pModelInfo->SetTextureDictionaryID(existingTxdId);
@@ -2585,6 +2586,7 @@ namespace
25852586
ClearPendingIsolatedModel(usModelId);
25862587
}
25872588

2589+
itExisting->second.bNeedsVehicleFallback = ShouldUseVehicleTxdFallback(usModelId);
25882590
g_IsolatedModelByTxd[existingTxdId] = usModelId;
25892591
if (pModelInfo->GetTextureDictionaryID() != existingTxdId)
25902592
pModelInfo->SetTextureDictionaryID(existingTxdId);
@@ -3961,6 +3963,8 @@ bool CRenderWareSA::ModelInfoTXDAddTextures(SReplacementTextures* pReplacementTe
39613963
QueuePendingReplacement(usModelId, pReplacementTextures, uiParentModelId, usParentTxdId);
39623964
return false;
39633965
}
3966+
3967+
itIsolated->second.bNeedsVehicleFallback = ShouldUseVehicleTxdFallback(usModelId);
39643968
}
39653969
}
39663970
else if (!g_bInTxdReapply)
@@ -3982,6 +3986,7 @@ bool CRenderWareSA::ModelInfoTXDAddTextures(SReplacementTextures* pReplacementTe
39823986
auto itOwner = g_IsolatedModelByTxd.find(usCurrentTxdId);
39833987
if (CTxdStore_GetTxd(usCurrentTxdId) != nullptr && itOwner != g_IsolatedModelByTxd.end() && itOwner->second == usModelId)
39843988
{
3989+
itPrevIsolated->second.bNeedsVehicleFallback = ShouldUseVehicleTxdFallback(usModelId);
39853990
UpdateIsolatedTxdLastUse(usModelId);
39863991
}
39873992
else
@@ -4105,6 +4110,8 @@ bool CRenderWareSA::ModelInfoTXDAddTextures(SReplacementTextures* pReplacementTe
41054110
QueuePendingReplacement(usModelId, pReplacementTextures, 0, 0);
41064111
return false;
41074112
}
4113+
4114+
itIsolated->second.bNeedsVehicleFallback = ShouldUseVehicleTxdFallback(usModelId);
41084115
}
41094116
else
41104117
{

0 commit comments

Comments
 (0)