edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed debug messages

Browse source
This commit is contained in:
KillaBilla 2014-04-11 21:33:48 +02:00 committed by oy
parent e96f1995b2
commit 1ea6100a3b
2 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/shared/mapchecker.cpp
View file

@ -82,16 +82,10 @@ bool CMapChecker::ReadAndValidateMap(IStorage *pStorage, const char *pFilename,
{ {
if(str_comp(pCurrent->m_aMapName, aMapName) == 0) if(str_comp(pCurrent->m_aMapName, aMapName) == 0)
{ {
dbg_msg("DEBUG", "CHECKING MAP: %s", aMapName);
char aBuffer[512]; // TODO: MAX_PATH_LENGTH (512) should be defined in a more central header and not in storage.cpp and editor.h char aBuffer[512]; // TODO: MAX_PATH_LENGTH (512) should be defined in a more central header and not in storage.cpp and editor.h
bool CrcSizeMatch = false; bool CrcSizeMatch = false;
if(!pStorage->FindFile(aMapNameExt, "maps", StorageType, aBuffer, sizeof(aBuffer), pCurrent->m_MapCrc, pCurrent->m_MapSize, &CrcSizeMatch)) if(!pStorage->FindFile(aMapNameExt, "maps", StorageType, aBuffer, sizeof(aBuffer), pCurrent->m_MapCrc, pCurrent->m_MapSize, &CrcSizeMatch))
{
dbg_msg("DEBUG", "FindFile returned false");
return true; return true;
}
dbg_msg("DEBUG", "FindFile returned true, CrcSizeMatch: %s", CrcSizeMatch ? "y" : "n");
// output filename // output filename
if(pBuffer != 0 && BufferSize > 0) if(pBuffer != 0 && BufferSize > 0)

35
src/engine/shared/storage.cpp
View file

@ -341,30 +341,27 @@ public:
if(Data->pBuffer[0]) if(Data->pBuffer[0])
return 1; return 1;
} }
else else if(!str_comp(pName, Data->pFilename))
{ {
if(!str_comp(pName, Data->pFilename)) // found the file
str_format(Data->pBuffer, Data->BufferSize, "%s/%s", Data->pPath, Data->pFilename);
// check crc and size
if(Data->pCrcSizeMatch != 0)
{ {
// found the file unsigned Crc = 0;
str_format(Data->pBuffer, Data->BufferSize, "%s/%s", Data->pPath, Data->pFilename); unsigned Size = 0;
if(!Data->pStorage->GetCrcSize(Data->pBuffer, Type, &Crc, &Size) || Crc != Data->WantedCrc || Size != Data->WantedSize)
// check crc and size
if(Data->pCrcSizeMatch != 0)
{ {
unsigned Crc = 0; *Data->pCrcSizeMatch = false;
unsigned Size = 0; Data->pBuffer[0] = 0;
if(!Data->pStorage->GetCrcSize(Data->pBuffer, Type, &Crc, &Size) || Crc != Data->WantedCrc || Size != Data->WantedSize) return 0;
{
*Data->pCrcSizeMatch = false;
Data->pBuffer[0] = 0;
return 0;
}
else
*Data->pCrcSizeMatch = true;
} }
else
return 1; *Data->pCrcSizeMatch = true;
} }
return 1;
} }
return 0; return 0;