Skip to content

Commit 8a0818e

Browse files
Synchronize changes from 1.6 master branch [ci skip]
81af84e Revert streaming changes (#4031)
2 parents a3969b3 + 81af84e commit 8a0818e

File tree

4 files changed

+125
-177
lines changed

4 files changed

+125
-177
lines changed

Client/mods/deathmatch/logic/CClientStreamSector.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class CClientStreamSector
3737
void Remove(CClientStreamElement* pElement) { m_Elements.remove(pElement); }
3838
std::list<CClientStreamElement*>::iterator Begin() { return m_Elements.begin(); }
3939
std::list<CClientStreamElement*>::iterator End() { return m_Elements.end(); }
40-
std::list<CClientStreamElement*>& GetElements() { return m_Elements; }
4140

4241
void AddElements(std::list<CClientStreamElement*>* pList);
4342
void RemoveElements(std::list<CClientStreamElement*>* pList);

Client/mods/deathmatch/logic/CClientStreamSectorRow.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class CClientStreamSectorRow
3131
void Add(CClientStreamSector* pSector);
3232
void Remove(CClientStreamSector* pSector);
3333
unsigned int CountSectors() { return m_Sectors.size(); }
34-
std::list<CClientStreamSector*>& GetList() noexcept { return m_Sectors; }
3534

3635
bool DoesContain(CVector& vecPosition);
3736
bool DoesContain(float fY);

0 commit comments

Comments
 (0)