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/shared/snapshot.cpp | |
| parent | e45ad2a085d8f02aadc5d823a1d7dda4e1da70aa (diff) | |
| download | zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.tar.gz zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.zip | |
Refactoring & fixed WEAPONSPEC_GUN in content.py
Diffstat (limited to 'src/engine/shared/snapshot.cpp')
| -rw-r--r-- | src/engine/shared/snapshot.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/shared/snapshot.cpp b/src/engine/shared/snapshot.cpp index 7ead4320..f908d1c2 100644 --- a/src/engine/shared/snapshot.cpp +++ b/src/engine/shared/snapshot.cpp @@ -286,7 +286,7 @@ int CSnapshotDelta::UnpackDelta(CSnapshot *pFrom, CSnapshot *pTo, void *pSrcData CSnapshotItem *pFromItem; int Keep, ItemSize; int *pDeleted; - int Id, Type, Key; + int ID, Type, Key; int FromIndex; int *pNewData; @@ -330,7 +330,7 @@ int CSnapshotDelta::UnpackDelta(CSnapshot *pFrom, CSnapshot *pTo, void *pSrcData return -1; Type = *pData++; - Id = *pData++; + ID = *pData++; if(m_aItemSizes[Type]) ItemSize = m_aItemSizes[Type]; else @@ -343,7 +343,7 @@ int CSnapshotDelta::UnpackDelta(CSnapshot *pFrom, CSnapshot *pTo, void *pSrcData if(RangeCheck(pEnd, pData, ItemSize) || ItemSize < 0) return -3; - Key = (Type<<16)|Id; + Key = (Type<<16)|ID; // create the item if needed pNewData = Builder.GetItemData(Key); |