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

Fixing spaces and globals

Browse source
This commit is contained in:
root 2017-08-30 00:34:14 +02:00
parent 2c748ebf70
commit 7cd95f63cf
1 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/tools/map_replace_image.cpp
View file

@ -15,8 +15,8 @@
new image filepath must be absolute or relative to the current position
*/
CDataFileReader DataReader;
CDataFileWriter DataWriter;
CDataFileReader g_DataReader;
CDataFileWriter g_DataWriter;
// global new image data (set by ReplaceImageItem)
int g_NewNameID = -1;
@ -82,7 +82,7 @@ void *ReplaceImageItem(void *pItem, int Type, const char *pImgName, const char *
return pItem;
CMapItemImage *pImgItem = (CMapItemImage *)pItem;
char *pName = (char *)DataReader.GetData(pImgItem->m_ImageName);
char *pName = (char *)g_DataReader.GetData(pImgItem->m_ImageName);
if(str_comp(pImgName, pName) != 0)
return pItem;
@ -140,13 +140,13 @@ int main(int argc, const char **argv)
void *pItem = 0;
void *pData = 0;
if(!DataReader.Open(pStorage, pSourceFileName, IStorage::TYPE_ALL))
if(!g_DataReader.Open(pStorage, pSourceFileName, IStorage::TYPE_ALL))
{
dbg_msg("map_replace_image", "failed to open source map. filename='%s'", pSourceFileName);
return -1;
}
if(!DataWriter.Open(pStorage, pDestFileName))
if(!g_DataWriter.Open(pStorage, pDestFileName))
{
dbg_msg("map_replace_image", "failed to open destination map. filename='%s'", pDestFileName);
return -1;
@ -155,15 +155,15 @@ int main(int argc, const char **argv)
png_init(0,0);
// add all items
for(int Index = 0; Index < DataReader.NumItems(); Index++)
for(int Index = 0; Index < g_DataReader.NumItems(); Index++)
{
CMapItemImage NewImageItem;
pItem = DataReader.GetItem(Index, &Type, &ID);
Size = DataReader.GetItemSize(Index);
pItem = g_DataReader.GetItem(Index, &Type, &ID);
Size = g_DataReader.GetItemSize(Index);
pItem = ReplaceImageItem(pItem, Type, pImageName, pImageFile, &NewImageItem);
if(!pItem)
return -1;
DataWriter.AddItem(Type, ID, Size, pItem);
g_DataWriter.AddItem(Type, ID, Size, pItem);
}
if(g_NewDataID == -1)
@ -173,7 +173,7 @@ int main(int argc, const char **argv)
}
// add all data
for(int Index = 0; Index < DataReader.NumItems(); Index++)
for(int Index = 0; Index < g_DataReader.NumItems(); Index++)
{
if(Index == g_NewDataID)
{
@ -187,15 +187,15 @@ int main(int argc, const char **argv)
}
else
{
pData = DataReader.GetData(Index);
Size = DataReader.GetUncompressedDataSize(Index);
pData = g_DataReader.GetData(Index);
Size = g_DataReader.GetUncompressedDataSize(Index);
}
DataWriter.AddData(Size, pData);
g_DataWriter.AddData(Size, pData);
}
DataReader.Close();
DataWriter.Finish();
g_DataReader.Close();
g_DataWriter.Finish();
dbg_msg("map_replace_image", "image '%s' replaced", pImageName);
return 0;