Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 7e361772b08b · 2025-02-15T23:15:59.000Z
df706b5 Addendum to 682b02b
diff --git a/Client/mods/deathmatch/logic/CClientStreamer.cpp b/Client/mods/deathmatch/logic/CClientStreamer.cpp
@@ -163,7 +163,7 @@ void CClientStreamer::SetDimension(unsigned short usDimension)
                 {
                     CClientStreamElement* element = *iter;
 
-                    if (IsElementShouldVisibleInCurrentDimesnion(element))
+                    if (ShouldElementBeVisibleInCurrentDimension(element))
                         iter++;
                     else
                     {
@@ -322,7 +322,7 @@ void CClientStreamer::RemoveElementFromSectors(CClientStreamElement* pElement)
 
 void CClientStreamer::AddElement(CClientStreamElement* pElement)
 {
-    if (IsElementShouldVisibleInCurrentDimesnion(pElement))
+    if (ShouldElementBeVisibleInCurrentDimension(pElement))
         AddElementInSectors(pElement);
     else
         m_outsideCurrentDimensionElements.push_back(pElement);
@@ -744,7 +744,7 @@ void CClientStreamer::OnElementForceStreamOut(CClientStreamElement* pElement)
 
 void CClientStreamer::OnElementDimension(CClientStreamElement* pElement)
 {
-    if (IsElementShouldVisibleInCurrentDimesnion(pElement))
+    if (ShouldElementBeVisibleInCurrentDimension(pElement))
     {
         if (!pElement->GetStreamSector())
         {

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ void CClientStreamer::SetDimension(unsigned short usDimension)`
`163`	`163`	`{`
`164`	`164`	`CClientStreamElement* element = *iter;`
`165`	`165`
`166`		`- if (IsElementShouldVisibleInCurrentDimesnion(element))`
	`166`	`+ if (ShouldElementBeVisibleInCurrentDimension(element))`
`167`	`167`	`iter++;`
`168`	`168`	`else`
`169`	`169`	`{`
`@@ -322,7 +322,7 @@ void CClientStreamer::RemoveElementFromSectors(CClientStreamElement* pElement)`
`322`	`322`
`323`	`323`	`void CClientStreamer::AddElement(CClientStreamElement* pElement)`
`324`	`324`	`{`
`325`		`- if (IsElementShouldVisibleInCurrentDimesnion(pElement))`
	`325`	`+ if (ShouldElementBeVisibleInCurrentDimension(pElement))`
`326`	`326`	`AddElementInSectors(pElement);`
`327`	`327`	`else`
`328`	`328`	`m_outsideCurrentDimensionElements.push_back(pElement);`
`@@ -744,7 +744,7 @@ void CClientStreamer::OnElementForceStreamOut(CClientStreamElement* pElement)`
`744`	`744`
`745`	`745`	`void CClientStreamer::OnElementDimension(CClientStreamElement* pElement)`
`746`	`746`	`{`
`747`		`- if (IsElementShouldVisibleInCurrentDimesnion(pElement))`
	`747`	`+ if (ShouldElementBeVisibleInCurrentDimension(pElement))`
`748`	`748`	`{`
`749`	`749`	`if (!pElement->GetStreamSector())`
`750`	`750`	`{`