Rename CDataFileReader::MapSize/IEngineMap::MapSize to Size (ddnet#11644)

Author: AssassinTee

src/engine/client/client.cpp

@@ -4068,7 +4068,7 @@ void CClient::DemoRecorder_Start(const char *pFilename, bool WithTimestamp, int
 		m_pMap->Sha256(),
 		m_pMap->Crc(),
 		"client",
-		m_pMap->MapSize(),
+		m_pMap->Size(),
 		nullptr,
 		m_pMap->File(),
 		nullptr,
@@ -5080,7 +5080,7 @@ void CClient::RaceRecord_Start(const char *pFilename)
 		m_pMap->Sha256(),
 		m_pMap->Crc(),
 		"client",
-		m_pMap->MapSize(),
+		m_pMap->Size(),
 		nullptr,
 		m_pMap->File(),
 		nullptr,

src/engine/map.h

@@ -43,7 +43,7 @@ class IEngineMap : public IMap
 
 	virtual SHA256_DIGEST Sha256() const = 0;
 	virtual unsigned Crc() const = 0;
-	virtual int MapSize() const = 0;
+	virtual int Size() const = 0;
 };
 
 extern IEngineMap *CreateEngineMap();

src/engine/shared/datafile.cpp

@@ -908,7 +908,7 @@ unsigned CDataFileReader::Crc() const
 	return m_pDataFile->m_Crc;
 }
 
-int CDataFileReader::MapSize() const
+int CDataFileReader::Size() const
 {
 	dbg_assert(m_pDataFile != nullptr, "File not open");
 

src/engine/shared/datafile.h

@@ -53,7 +53,7 @@ class CDataFileReader
 
 	SHA256_DIGEST Sha256() const;
 	unsigned Crc() const;
-	int MapSize() const;
+	int Size() const;
 };
 
 // write access

src/engine/shared/map.cpp

@@ -155,9 +155,9 @@ unsigned CMap::Crc() const
 	return m_DataFile.Crc();
 }
 
-int CMap::MapSize() const
+int CMap::Size() const
 {
-	return m_DataFile.MapSize();
+	return m_DataFile.Size();
 }
 
 void CMap::ExtractTiles(CTile *pDest, size_t DestSize, const CTile *pSrc, size_t SrcSize)

src/engine/shared/map.h

@@ -39,7 +39,7 @@ class CMap : public IEngineMap
 
 	SHA256_DIGEST Sha256() const override;
 	unsigned Crc() const override;
-	int MapSize() const override;
+	int Size() const override;
 
 	static void ExtractTiles(class CTile *pDest, size_t DestSize, const class CTile *pSrc, size_t SrcSize);
 };

src/game/client/gameclient.cpp

@@ -4565,7 +4565,7 @@ void CGameClient::LoadMapSettings()
 {
 	IEngineMap *pMap = Kernel()->RequestInterface<IEngineMap>();
 
-	m_MapBugs = CMapBugs::Create(Client()->GetCurrentMap(), pMap->MapSize(), pMap->Sha256());
+	m_MapBugs = CMapBugs::Create(Client()->GetCurrentMap(), pMap->Size(), pMap->Sha256());
 
 	// Reset Tunezones
 	for(int TuneZone = 0; TuneZone < TuneZone::NUM; TuneZone++)

src/tools/map_test.cpp

@@ -20,7 +20,7 @@ static int TestMap(const char *pMap, bool CalcHashes, IStorage *pStorage)
 
 	char aSha256Str[SHA256_MAXSTRSIZE];
 	sha256_str(Reader.Sha256(), aSha256Str, sizeof(aSha256Str));
-	log_info(TOOL_NAME, "File size: %d", Reader.MapSize());
+	log_info(TOOL_NAME, "File size: %d", Reader.Size());
 	log_info(TOOL_NAME, "File SHA256: %s", aSha256Str);
 	log_info(TOOL_NAME, "File CRC32: %08x", Reader.Crc());
 	log_info(TOOL_NAME, "Num items: %d", Reader.NumItems());