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

Merge #4828

Browse source 
4828: Fixed bad DataReader loop on map_replace_image r=def- a=sctt


Happy to see that map_replace_image has actually been useful to you as it was used as a base to code map_convert_07.

As stated here https://github.com/ddnet/ddnet7/issues/20, map_replace_image seems to somehow break the map, that is due to a bad check inside the last datareader loop (it is just checking NumItems instead NumData).

Seems like it was just a coincidence that the tool was correctly working on the map i was testing, but i was able to confirm the problem by trying different maps.

now it is fixed.

Co-authored-by: sctt <scottistefano91@gmail.com>
This commit is contained in:
bors[bot] 2022-03-16 16:34:06 +00:00 committed by GitHub
parent c712b756ab bc901d6eb2
commit 3268986d91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/tools/map_replace_image.cpp
View file

@ -32,7 +32,7 @@ int LoadPNG(CImageInfo *pImg, const char *pFilename)
IOHANDLE File = io_open(pFilename, IOFLAG_READ);
if(!File)
{
dbg_msg("dilate", "failed to open file. filename='%s'", pFilename);
dbg_msg("map_replace_image", "failed to open file. filename='%s'", pFilename);
return 0;
}
int Error = png_open_read(&Png, 0, File);
@ -54,7 +54,7 @@ int LoadPNG(CImageInfo *pImg, const char *pFilename)
Error = png_get_data(&Png, pBuffer);
if(Error != PNG_NO_ERROR)
{
dbg_msg("map_convert_07", "failed to read image. filename='%s', pnglite: %s", pFilename, png_error_string(Error));
dbg_msg("map_replace_image", "failed to read image. filename='%s', pnglite: %s", pFilename, png_error_string(Error));
free(pBuffer);
io_close(File);
return 0;
@ -181,7 +181,7 @@ int main(int argc, const char **argv)
}
// add all data
for(int Index = 0; Index < g_DataReader.NumItems(); Index++)
for(int Index = 0; Index < g_DataReader.NumData(); Index++)
{
if(Index == g_NewDataID)
{