Merge branch 'master' into feature/2dfx

FileEX · Sep 27, 2024 · 225b5c4 · 225b5c4
2 parents c905a3d + 20a161d
commit 225b5c4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Client/mods/deathmatch/logic/CClientModel.cpp b/Client/mods/deathmatch/logic/CClientModel.cpp
@@ -84,9 +84,6 @@ bool CClientModel::Deallocate()
     if (!m_bAllocatedByUs)
         return false;
 
-    if (m_pParentResource)
-        m_pParentResource->GetResourceModelStreamer()->FullyReleaseModel(m_iModelID);
-
     SetParentResource(nullptr);
 
     CModelInfo* pModelInfo = g_pGame->GetModelInfo(m_iModelID, true);

diff --git a/Client/mods/deathmatch/logic/CClientModelManager.cpp b/Client/mods/deathmatch/logic/CClientModelManager.cpp
@@ -49,6 +49,9 @@ bool CClientModelManager::Remove(const std::shared_ptr<CClientModel>& pModel)
     int modelId = pModel->GetModelID();
     if (m_Models[modelId] != nullptr)
     {
+        CResource* parentResource = m_Models[modelId]->GetParentResource();
+        if (parentResource)
+            parentResource->GetResourceModelStreamer()->FullyReleaseModel(modelId);
         m_Models[modelId]->RestoreEntitiesUsingThisModel();
         m_Models[modelId] = nullptr;
         m_modelCount--;

diff --git a/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot b/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MTA San Andreas 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-25 18:23+0000\n"
+"POT-Creation-Date: 2024-09-27 04:28+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -2340,7 +2340,7 @@ msgstr ""
 
 #: Client/core/CVersionUpdater.cpp:1915
 msgid ""
-"Update not currently avalable.\n"
+"An update is currently not available.\n"
 "\n"
 "Please check www.mtasa.com"
 msgstr ""