From c50450e8ba13ce29582697aa15c96422c56d62a3 Mon Sep 17 00:00:00 2001 From: ForserX Date: Sun, 29 Sep 2024 16:14:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=BB=D0=B1=D0=B5=D1=81=D0=BE?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/xrCore/XmlParser/AsureXML.cpp | 2 +- src/xrCore/XmlParser/AsureXML.h | 2 +- src/xrParticles/ParticlesObject.cpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/xrCore/XmlParser/AsureXML.cpp b/src/xrCore/XmlParser/AsureXML.cpp index 4845df7dd8..a866968c99 100644 --- a/src/xrCore/XmlParser/AsureXML.cpp +++ b/src/xrCore/XmlParser/AsureXML.cpp @@ -2,7 +2,7 @@ #include "AsureXML.h" #include -CXMLOverride::EOverrideMode CXMLOverride::GetOverrideMode(tinyxml2::XMLElement* Element) +CXMLOverride::EOverrideMode CXMLOverride::GetOverrideMode(tinyxml2::XMLElement* Element) const { if (Element->Attribute("override")) { diff --git a/src/xrCore/XmlParser/AsureXML.h b/src/xrCore/XmlParser/AsureXML.h index 1e5edbe524..2eb9482641 100644 --- a/src/xrCore/XmlParser/AsureXML.h +++ b/src/xrCore/XmlParser/AsureXML.h @@ -21,5 +21,5 @@ class CXMLOverride void ApplyNewNode(tinyxml2::XMLNode* Parent, tinyxml2::XMLElement* Inner); void CopyAttributes(tinyxml2::XMLElement* Dest, tinyxml2::XMLElement* Src); void CopyChildren(tinyxml2::XMLElement* Dest, tinyxml2::XMLElement* Src); - EOverrideMode GetOverrideMode(tinyxml2::XMLElement* Element); + EOverrideMode GetOverrideMode(tinyxml2::XMLElement* Element) const; }; \ No newline at end of file diff --git a/src/xrParticles/ParticlesObject.cpp b/src/xrParticles/ParticlesObject.cpp index a748dbbfc4..ef2549938c 100644 --- a/src/xrParticles/ParticlesObject.cpp +++ b/src/xrParticles/ParticlesObject.cpp @@ -16,7 +16,6 @@ xr_task_group ParticleObjectTasks; PARTICLES_API const Fvector zero_vel = {0.f,0.f,0.f}; xr_list CParticlesObject::AllParticleObjects; -static xrCriticalSection particles_lock; CParticlesObject::CParticlesObject (LPCSTR p_name, BOOL bAutoRemove, bool destroy_on_game_load) : inherited (destroy_on_game_load)