diff options
| author | GreYFoXGTi <GreYFoXGTi@GMaiL.CoM> | 2011-02-12 12:40:36 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-02-12 21:18:41 +0100 |
| commit | 1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251 (patch) | |
| tree | d4b94b98105c3af23c79bae02a132bfe66738392 /src/engine/client/client.cpp | |
| parent | e45ad2a085d8f02aadc5d823a1d7dda4e1da70aa (diff) | |
| download | zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.tar.gz zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.zip | |
Refactoring & fixed WEAPONSPEC_GUN in content.py
Diffstat (limited to 'src/engine/client/client.cpp')
| -rw-r--r-- | src/engine/client/client.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 6b52615e..c0be7bc0 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -771,55 +771,55 @@ int CClient::LoadData() // --- -void *CClient::SnapGetItem(int SnapId, int Index, CSnapItem *pItem) +void *CClient::SnapGetItem(int SnapID, int Index, CSnapItem *pItem) { CSnapshotItem *i; - dbg_assert(SnapId >= 0 && SnapId < NUM_SNAPSHOT_TYPES, "invalid SnapId"); - i = m_aSnapshots[SnapId]->m_pAltSnap->GetItem(Index); - pItem->m_DataSize = m_aSnapshots[SnapId]->m_pAltSnap->GetItemSize(Index); + dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID"); + i = m_aSnapshots[SnapID]->m_pAltSnap->GetItem(Index); + pItem->m_DataSize = m_aSnapshots[SnapID]->m_pAltSnap->GetItemSize(Index); pItem->m_Type = i->Type(); - pItem->m_Id = i->ID(); + pItem->m_ID = i->ID(); return (void *)i->Data(); } -void CClient::SnapInvalidateItem(int SnapId, int Index) +void CClient::SnapInvalidateItem(int SnapID, int Index) { CSnapshotItem *i; - dbg_assert(SnapId >= 0 && SnapId < NUM_SNAPSHOT_TYPES, "invalid SnapId"); - i = m_aSnapshots[SnapId]->m_pAltSnap->GetItem(Index); + dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID"); + i = m_aSnapshots[SnapID]->m_pAltSnap->GetItem(Index); if(i) { - if((char *)i < (char *)m_aSnapshots[SnapId]->m_pAltSnap || (char *)i > (char *)m_aSnapshots[SnapId]->m_pAltSnap + m_aSnapshots[SnapId]->m_SnapSize) + if((char *)i < (char *)m_aSnapshots[SnapID]->m_pAltSnap || (char *)i > (char *)m_aSnapshots[SnapID]->m_pAltSnap + m_aSnapshots[SnapID]->m_SnapSize) m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", "snap invalidate problem"); - if((char *)i >= (char *)m_aSnapshots[SnapId]->m_pSnap && (char *)i < (char *)m_aSnapshots[SnapId]->m_pSnap + m_aSnapshots[SnapId]->m_SnapSize) + if((char *)i >= (char *)m_aSnapshots[SnapID]->m_pSnap && (char *)i < (char *)m_aSnapshots[SnapID]->m_pSnap + m_aSnapshots[SnapID]->m_SnapSize) m_pConsole->Print(IConsole::OUTPUT_LEVEL_DEBUG, "client", "snap invalidate problem"); i->m_TypeAndID = -1; } } -void *CClient::SnapFindItem(int SnapId, int Type, int Id) +void *CClient::SnapFindItem(int SnapID, int Type, int ID) { // TODO: linear search. should be fixed. int i; - if(!m_aSnapshots[SnapId]) + if(!m_aSnapshots[SnapID]) return 0x0; - for(i = 0; i < m_aSnapshots[SnapId]->m_pSnap->NumItems(); i++) + for(i = 0; i < m_aSnapshots[SnapID]->m_pSnap->NumItems(); i++) { - CSnapshotItem *pItem = m_aSnapshots[SnapId]->m_pAltSnap->GetItem(i); - if(pItem->Type() == Type && pItem->ID() == Id) + CSnapshotItem *pItem = m_aSnapshots[SnapID]->m_pAltSnap->GetItem(i); + if(pItem->Type() == Type && pItem->ID() == ID) return (void *)pItem->Data(); } return 0x0; } -int CClient::SnapNumItems(int SnapId) +int CClient::SnapNumItems(int SnapID) { - dbg_assert(SnapId >= 0 && SnapId < NUM_SNAPSHOT_TYPES, "invalid SnapId"); - if(!m_aSnapshots[SnapId]) + dbg_assert(SnapID >= 0 && SnapID < NUM_SNAPSHOT_TYPES, "invalid SnapID"); + if(!m_aSnapshots[SnapID]) return 0; - return m_aSnapshots[SnapId]->m_pSnap->NumItems(); + return m_aSnapshots[SnapID]->m_pSnap->NumItems(); } void CClient::SnapSetStaticsize(int ItemType, int Size) |