From 1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Sat, 12 Feb 2011 12:40:36 +0200 Subject: Refactoring & fixed WEAPONSPEC_GUN in content.py --- src/engine/shared/snapshot.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/engine/shared/snapshot.cpp') 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); -- cgit 1.4.1