Fix texture shader "wrap" replacement (as well as a similar case per GTA's logic)

Author: Dutchman101

Client/game_sa/CRenderWareSA.TextureReplacing.cpp

@@ -270,6 +270,23 @@ bool CRenderWareSA::ModelInfoTXDAddTextures(SReplacementTextures* pReplacementTe
 
         // If there is a name clash with an existing texture, replace it
         RwTexture* pExistingTexture = RwTexDictionaryFindNamedTexture(pInfo->pTxd, pNewTexture->name);
+
+        // Handle internal texture names (e.g., "remap" -> "#emap", "white" -> "@hite").
+        // If the TXD contains the internal name, treat it as collided.
+        // Ensure the replacement texture uses the internal name so the game engine can find it.
+        if (!pExistingTexture)
+        {
+            const char* szInternalName = GetInternalTextureName(pNewTexture->name);
+            if (szInternalName != pNewTexture->name)
+            {
+                pExistingTexture = RwTexDictionaryFindNamedTexture(pInfo->pTxd, szInternalName);
+                
+                // Rename the replacement texture to match the internal name expected by the game engine.
+                // This is required even if the original texture is missing, as the game hardcodes lookups for names like "#emap".
+                strncpy(pNewTexture->name, szInternalName, RW_TEXTURE_NAME_LENGTH);
+            }
+        }
+
         if (pExistingTexture)
         {
             RwTexDictionaryRemoveTexture(pInfo->pTxd, pExistingTexture);

Client/game_sa/CRenderWareSA.cpp

@@ -12,6 +12,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
+#include <array>
 #include <CMatrix.h>
 #include <core/CCoreInterface.h>
 #define RWFUNC_IMPLEMENT
@@ -816,6 +817,62 @@ void CRenderWareSA::TxdForceUnload(ushort usTxdId, bool bDestroyTextures)
     }
 }
 
+namespace
+{
+    struct TextureMapping
+    {
+        const char* externalName;
+        const char* internalName;
+    };
+
+    constexpr std::array<TextureMapping, 2> kTextureMappings = {{
+        {"remap", "#emap"},
+        {"white", "@hite"}
+    }};
+}
+
+////////////////////////////////////////////////////////////////
+//
+// CRenderWareSA::GetInternalTextureName
+//
+// Maps external texture names (e.g. "remap") to internal GTA:SA names (e.g. "#emap")
+// Returns original name if no mapping exists
+//
+////////////////////////////////////////////////////////////////
+const char* CRenderWareSA::GetInternalTextureName(const char* szExternalName)
+{
+    if (!szExternalName)
+        return nullptr;
+
+    for (const auto& mapping : kTextureMappings)
+    {
+        if (_stricmp(szExternalName, mapping.externalName) == 0)
+            return mapping.internalName;
+    }
+    return szExternalName;
+}
+
+////////////////////////////////////////////////////////////////
+//
+// CRenderWareSA::GetExternalTextureName
+//
+// Maps internal GTA:SA names (e.g. "#emap") to external texture names (e.g. "remap")
+// Returns original name if no mapping exists
+//
+////////////////////////////////////////////////////////////////
+const char* CRenderWareSA::GetExternalTextureName(const char* szInternalName)
+{
+    if (!szInternalName)
+        return nullptr;
+
+    for (const auto& mapping : kTextureMappings)
+    {
+        if (_stricmp(szInternalName, mapping.internalName) == 0)
+            return mapping.externalName;
+    }
+    return szInternalName;
+}
+
 ////////////////////////////////////////////////////////////////
 //
 // CRenderWareSA::GetTXDIDForModelID
@@ -889,9 +946,13 @@ void CRenderWareSA::GetModelTextureNames(std::vector<SString>& outNameList, usho
     std::vector<RwTexture*> textureList;
     GetTxdTextures(textureList, pTXD);
 
-    for (std::vector<RwTexture*>::iterator iter = textureList.begin(); iter != textureList.end(); iter++)
+    for (RwTexture* pTexture : textureList)
     {
-        outNameList.push_back((*iter)->name);
+        // Fix for #emap corruption:
+        // Some textures (like 'remap') are internally renamed to start with '#' (e.g. '#emap') by SA.
+        // This causes issues when scripts try to access them by their original name.
+        // We detect this case and return the expected name 'remap' instead.
+        outNameList.push_back(GetExternalTextureName(pTexture->name));
     }
 
     if (bLoadedModel)
@@ -951,7 +1012,8 @@ bool CRenderWareSA::GetModelTextures(std::vector<std::tuple<std::string, CPixels
 
     for (RwTexture* pTexture : rwTextureList)
     {
-        SString strTextureName = pTexture->name;
+        SString strTextureName = GetExternalTextureName(pTexture->name);
+
         bool    bValidTexture = false;
 
         if (bExcludeTextures)

Client/game_sa/CRenderWareSA.h

@@ -146,6 +146,9 @@ class CRenderWareSA : public CRenderWare
     static void GetClumpAtomicList(RpClump* pClump, std::vector<RpAtomic*>& outAtomicList);
     static bool DoContainTheSameGeometry(RpClump* pClumpA, RpClump* pClumpB, RpAtomic* pAtomicB);
 
+    static const char* GetInternalTextureName(const char* szExternalName);
+    static const char* GetExternalTextureName(const char* szInternalName);
+
     void OnTextureStreamIn(STexInfo* pTexInfo);
     void OnTextureStreamOut(STexInfo* pTexInfo);
     void DisableGTAVertexShadersForAWhile();