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

Merge pull request #8585 from Robyt3/Tools-Demo-Extract-Chat-Snapshot-Cleanup

Browse source 
Cleanup snapshot member variables in `demo_extract_chat` tool
This commit is contained in:
Dennis Felsing 2024-07-13 22:10:28 +00:00 committed by GitHub
parent 9249b61f9f a31d6a571a
commit 7014021909
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/tools/demo_extract_chat.cpp
View file

@ -20,23 +20,17 @@ public:
};
CClientData m_aClients[MAX_CLIENTS];
CSnapshotStorage::CHolder m_aDemoSnapshotHolders[IClient::NUM_SNAPSHOT_TYPES];
char m_aaaDemoSnapshotData[IClient::NUM_SNAPSHOT_TYPES][2][CSnapshot::MAX_SIZE];
CSnapshotStorage::CHolder *m_apSnapshots[IClient::NUM_SNAPSHOT_TYPES];
char m_aaDemoSnapshotData[IClient::NUM_SNAPSHOT_TYPES][CSnapshot::MAX_SIZE];
CSnapshot *m_apAltSnapshots[IClient::NUM_SNAPSHOT_TYPES];
CClientSnapshotHandler() :
m_aClients(), m_aDemoSnapshotHolders()
m_aClients()
{
mem_zero(m_aaaDemoSnapshotData, sizeof(m_aaaDemoSnapshotData));
mem_zero(m_aaDemoSnapshotData, sizeof(m_aaDemoSnapshotData));
for(int SnapshotType = 0; SnapshotType < IClient::NUM_SNAPSHOT_TYPES; SnapshotType++)
{
m_apSnapshots[SnapshotType] = &m_aDemoSnapshotHolders[SnapshotType];
m_apSnapshots[SnapshotType]->m_pSnap = (CSnapshot *)&m_aaaDemoSnapshotData[SnapshotType][0];
m_apSnapshots[SnapshotType]->m_pAltSnap = (CSnapshot *)&m_aaaDemoSnapshotData[SnapshotType][1];
m_apSnapshots[SnapshotType]->m_SnapSize = 0;
m_apSnapshots[SnapshotType]->m_AltSnapSize = 0;
m_apSnapshots[SnapshotType]->m_Tick = -1;
m_apAltSnapshots[SnapshotType] = (CSnapshot *)&m_aaDemoSnapshotData[SnapshotType];
}
}
@ -74,17 +68,15 @@ public:
int SnapNumItems(int SnapId)
{
dbg_assert(SnapId >= 0 && SnapId < IClient::NUM_SNAPSHOT_TYPES, "invalid SnapId");
if(!m_apSnapshots[SnapId])
return 0;
return m_apSnapshots[SnapId]->m_pAltSnap->NumItems();
return m_apAltSnapshots[SnapId]->NumItems();
}
void *SnapGetItem(int SnapId, int Index, IClient::CSnapItem *pItem)
{
dbg_assert(SnapId >= 0 && SnapId < IClient::NUM_SNAPSHOT_TYPES, "invalid SnapId");
const CSnapshotItem *pSnapshotItem = m_apSnapshots[SnapId]->m_pAltSnap->GetItem(Index);
pItem->m_DataSize = m_apSnapshots[SnapId]->m_pAltSnap->GetItemSize(Index);
pItem->m_Type = m_apSnapshots[SnapId]->m_pAltSnap->GetItemType(Index);
const CSnapshotItem *pSnapshotItem = m_apAltSnapshots[SnapId]->GetItem(Index);
pItem->m_DataSize = m_apAltSnapshots[SnapId]->GetItemSize(Index);
pItem->m_Type = m_apAltSnapshots[SnapId]->GetItemType(Index);
pItem->m_Id = pSnapshotItem->Id();
return (void *)pSnapshotItem->Data();
}
@ -118,9 +110,8 @@ public:
if(AltSnapSize < 0)
return;
std::swap(m_apSnapshots[IClient::SNAP_PREV], m_apSnapshots[IClient::SNAP_CURRENT]);
mem_copy(m_apSnapshots[IClient::SNAP_CURRENT]->m_pSnap, pData, Size);
mem_copy(m_apSnapshots[IClient::SNAP_CURRENT]->m_pAltSnap, pAltSnapBuffer, AltSnapSize);
std::swap(m_apAltSnapshots[IClient::SNAP_PREV], m_apAltSnapshots[IClient::SNAP_CURRENT]);
mem_copy(m_apAltSnapshots[IClient::SNAP_CURRENT], pAltSnapBuffer, AltSnapSize);
OnNewSnapshot();
}