about summary refs log tree commit diff
path: root/src/engine/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/shared')
-rw-r--r--src/engine/shared/datafile.cpp44
-rw-r--r--src/engine/shared/datafile.h8
-rw-r--r--src/engine/shared/map.cpp4
-rw-r--r--src/engine/shared/snapshot.cpp6
4 files changed, 31 insertions, 31 deletions
diff --git a/src/engine/shared/datafile.cpp b/src/engine/shared/datafile.cpp
index ea8902a6..a24ea765 100644
--- a/src/engine/shared/datafile.cpp
+++ b/src/engine/shared/datafile.cpp
@@ -18,13 +18,13 @@ struct CDatafileItemType
 
 struct CDatafileItem
 {
-	int m_TypeAndId;
+	int m_TypeAndID;
 	int m_Size;
 };
 
 struct CDatafileHeader
 {
-	char m_aId[4];
+	char m_aID[4];
 	int m_Version;
 	int m_Size;
 	int m_Swaplen;
@@ -104,11 +104,11 @@ bool CDataFileReader::Open(class IStorage *pStorage, const char *pFilename, int
 	// TODO: change this header
 	CDatafileHeader Header;
 	io_read(File, &Header, sizeof(Header));
-	if(Header.m_aId[0] != 'A' || Header.m_aId[1] != 'T' || Header.m_aId[2] != 'A' || Header.m_aId[3] != 'D')
+	if(Header.m_aID[0] != 'A' || Header.m_aID[1] != 'T' || Header.m_aID[2] != 'A' || Header.m_aID[3] != 'D')
 	{
-		if(Header.m_aId[0] != 'D' || Header.m_aId[1] != 'A' || Header.m_aId[2] != 'T' || Header.m_aId[3] != 'A')
+		if(Header.m_aID[0] != 'D' || Header.m_aID[1] != 'A' || Header.m_aID[2] != 'T' || Header.m_aID[3] != 'A')
 		{
-			dbg_msg("datafile", "wrong signature. %x %x %x %x", Header.m_aId[0], Header.m_aId[1], Header.m_aId[2], Header.m_aId[3]);
+			dbg_msg("datafile", "wrong signature. %x %x %x %x", Header.m_aID[0], Header.m_aID[1], Header.m_aID[2], Header.m_aID[3]);
 			return 0;
 		}
 	}
@@ -318,15 +318,15 @@ int CDataFileReader::GetItemSize(int Index)
 	return  m_pDataFile->m_Info.m_pItemOffsets[Index+1]-m_pDataFile->m_Info.m_pItemOffsets[Index];
 }
 
-void *CDataFileReader::GetItem(int Index, int *pType, int *pId)
+void *CDataFileReader::GetItem(int Index, int *pType, int *pID)
 {
-	if(!m_pDataFile) { if(pType) *pType = 0; if(pId) *pId = 0; return 0; }
+	if(!m_pDataFile) { if(pType) *pType = 0; if(pID) *pID = 0; return 0; }
 	
 	CDatafileItem *i = (CDatafileItem *)(m_pDataFile->m_Info.m_pItemStart+m_pDataFile->m_Info.m_pItemOffsets[Index]);
 	if(pType)
-		*pType = (i->m_TypeAndId>>16)&0xffff; // remove sign extention
-	if(pId)
-		*pId = i->m_TypeAndId&0xffff;
+		*pType = (i->m_TypeAndID>>16)&0xffff; // remove sign extention
+	if(pID)
+		*pID = i->m_TypeAndID&0xffff;
 	return (void *)(i+1);
 }
 
@@ -349,7 +349,7 @@ void CDataFileReader::GetType(int Type, int *pStart, int *pNum)
 	}
 }
 
-void *CDataFileReader::FindItem(int Type, int Id)
+void *CDataFileReader::FindItem(int Type, int ID)
 {
 	if(!m_pDataFile) return 0;
 	
@@ -357,9 +357,9 @@ void *CDataFileReader::FindItem(int Type, int Id)
 	GetType(Type, &Start, &Num);
 	for(int i = 0; i < Num; i++)
 	{
-		int ItemId;
-		void *pItem = GetItem(Start+i,0, &ItemId);
-		if(Id == ItemId)
+		int ItemID;
+		void *pItem = GetItem(Start+i,0, &ItemID);
+		if(ID == ItemID)
 			return pItem;
 	}
 	return 0;
@@ -414,7 +414,7 @@ bool CDataFileWriter::Open(class IStorage *pStorage, const char *pFilename)
 	return true;
 }
 
-int CDataFileWriter::AddItem(int Type, int Id, int Size, void *pData)
+int CDataFileWriter::AddItem(int Type, int ID, int Size, void *pData)
 {
 	if(!m_File) return 0;
 
@@ -423,7 +423,7 @@ int CDataFileWriter::AddItem(int Type, int Id, int Size, void *pData)
 	dbg_assert(Size%sizeof(int) == 0, "incorrect boundary");
 
 	m_aItems[m_NumItems].m_Type = Type;
-	m_aItems[m_NumItems].m_Id = Id;
+	m_aItems[m_NumItems].m_ID = ID;
 	m_aItems[m_NumItems].m_Size = Size;
 	
 	// copy data
@@ -533,10 +533,10 @@ int CDataFileWriter::Finish()
 	
 	// construct Header
 	{
-		Header.m_aId[0] = 'D';
-		Header.m_aId[1] = 'A';
-		Header.m_aId[2] = 'T';
-		Header.m_aId[3] = 'A';
+		Header.m_aID[0] = 'D';
+		Header.m_aID[1] = 'A';
+		Header.m_aID[2] = 'T';
+		Header.m_aID[3] = 'A';
 		Header.m_Version = 4;
 		Header.m_Size = FileSize - 16;
 		Header.m_Swaplen = SwapSize - 16;
@@ -634,10 +634,10 @@ int CDataFileWriter::Finish()
 			while(k != -1)
 			{
 				CDatafileItem Item;
-				Item.m_TypeAndId = (i<<16)|m_aItems[k].m_Id;
+				Item.m_TypeAndID = (i<<16)|m_aItems[k].m_ID;
 				Item.m_Size = m_aItems[k].m_Size;
 				if(DEBUG)
-					dbg_msg("datafile", "writing item type=%x idx=%d id=%d size=%d", i, k, m_aItems[k].m_Id, m_aItems[k].m_Size);
+					dbg_msg("datafile", "writing item type=%x idx=%d id=%d size=%d", i, k, m_aItems[k].m_ID, m_aItems[k].m_Size);
 				
 #if defined(CONF_ARCH_ENDIAN_BIG)
 				swap_endian(&Item, sizeof(int), sizeof(Item)/sizeof(int));
diff --git a/src/engine/shared/datafile.h b/src/engine/shared/datafile.h
index f7ee2847..ce7b11aa 100644
--- a/src/engine/shared/datafile.h
+++ b/src/engine/shared/datafile.h
@@ -21,10 +21,10 @@ public:
 	void *GetDataSwapped(int Index); // makes sure that the data is 32bit LE ints when saved
 	int GetDataSize(int Index);
 	void UnloadData(int Index);
-	void *GetItem(int Index, int *pType, int *pId);
+	void *GetItem(int Index, int *pType, int *pID);
 	int GetItemSize(int Index);
 	void GetType(int Type, int *pStart, int *pNum);
-	void *FindItem(int Type, int Id);
+	void *FindItem(int Type, int ID);
 	int NumItems();
 	int NumData();
 	void Unload();
@@ -45,7 +45,7 @@ class CDataFileWriter
 	struct CItemInfo
 	{
 		int m_Type;
-		int m_Id;
+		int m_ID;
 		int m_Size;
 		int m_Next;
 		int m_Prev;
@@ -72,7 +72,7 @@ public:
 	bool Open(class IStorage *pStorage, const char *Filename);
 	int AddData(int Size, void *pData);
 	int AddDataSwapped(int Size, void *pData);
-	int AddItem(int Type, int Id, int Size, void *pData);
+	int AddItem(int Type, int ID, int Size, void *pData);
 	int Finish();
 };
 
diff --git a/src/engine/shared/map.cpp b/src/engine/shared/map.cpp
index c0931d54..c57dd708 100644
--- a/src/engine/shared/map.cpp
+++ b/src/engine/shared/map.cpp
@@ -14,9 +14,9 @@ public:
 	virtual void *GetData(int Index) { return m_DataFile.GetData(Index); }
 	virtual void *GetDataSwapped(int Index) { return m_DataFile.GetDataSwapped(Index); }
 	virtual void UnloadData(int Index) { m_DataFile.UnloadData(Index); }
-	virtual void *GetItem(int Index, int *pType, int *pId) { return m_DataFile.GetItem(Index, pType, pId); }
+	virtual void *GetItem(int Index, int *pType, int *pID) { return m_DataFile.GetItem(Index, pType, pID); }
 	virtual void GetType(int Type, int *pStart, int *pNum) { m_DataFile.GetType(Type, pStart, pNum); }
-	virtual void *FindItem(int Type, int Id) { return m_DataFile.FindItem(Type, Id); }
+	virtual void *FindItem(int Type, int ID) { return m_DataFile.FindItem(Type, ID); }
 	virtual int NumItems() { return m_DataFile.NumItems(); }
 	
 	virtual void Unload()
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);
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-12-09 20:39:48 +0000