edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use move instead of copy assignment operator for the ghost

Browse source
This commit is contained in:
Redix 2017-09-28 16:42:47 +02:00
parent c832beca63
commit 0891ce2812
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/game/client/components/ghost.cpp
View file

@ -56,12 +56,21 @@ void CGhost::GetNetObjCharacter(CNetObj_Character *pChar, const CGhostCharacter
pChar->m_Tick = pGhostChar->m_Tick;
}
void CGhost::CGhostPath::Copy(const CGhostPath &Other)
CGhost::CGhostPath::CGhostPath(CGhostPath &&Other)
: m_ChunkSize(Other.m_ChunkSize), m_NumItems(Other.m_NumItems), m_lChunks(std::move(Other.m_lChunks))
{
Other.m_NumItems = 0;
Other.m_lChunks.clear();
}
CGhost::CGhostPath &CGhost::CGhostPath::operator = (CGhostPath &&Other)
{
Reset(Other.m_ChunkSize);
SetSize(Other.Size());
for(int i = 0; i < m_lChunks.size(); i++)
mem_copy(m_lChunks[i], Other.m_lChunks[i], sizeof(CGhostCharacter) * m_ChunkSize);
m_NumItems = Other.m_NumItems;
m_lChunks = std::move(Other.m_lChunks);
Other.m_NumItems = 0;
Other.m_lChunks.clear();
return *this;
}
void CGhost::CGhostPath::Reset(int ChunkSize)
@ -80,7 +89,7 @@ void CGhost::CGhostPath::SetSize(int Items)
if(NeededChunks > Chunks)
{
m_lChunks.set_size(NeededChunks);
m_lChunks.resize(NeededChunks);
for(int i = Chunks; i < NeededChunks; i++)
m_lChunks[i] = (CGhostCharacter*)mem_alloc(sizeof(CGhostCharacter) * m_ChunkSize, 1);
}
@ -350,7 +359,7 @@ void CGhost::StopRecord(int Time)
// add to active ghosts
int Slot = GetSlot();
if(Slot != -1)
m_aActiveGhosts[Slot] = m_CurGhost;
m_aActiveGhosts[Slot] = std::move(m_CurGhost);
// create ghost item
CMenus::CGhostItem Item;

11
src/game/client/components/ghost.h
View file

@ -59,15 +59,16 @@ private:
int m_ChunkSize;
int m_NumItems;
array<CGhostCharacter*> m_lChunks;
void Copy(const CGhostPath &other);
std::vector<CGhostCharacter*> m_lChunks;
public:
CGhostPath() { Reset(); }
~CGhostPath() { Reset(); }
CGhostPath(const CGhostPath &Other) { Copy(Other); };
CGhostPath &operator = (const CGhostPath &Other) { Copy(Other); return *this; };
CGhostPath(const CGhostPath &Other) = delete;
CGhostPath &operator = (const CGhostPath &Other) = delete;
CGhostPath(CGhostPath &&Other);
CGhostPath &operator = (CGhostPath &&Other);
void Reset(int ChunkSize = 25 * 60); // one minute with default snap rate
void SetSize(int Items);