minetest/minetestmapper
1
0
Fork 0
mirror of https://github.com/minetest/minetestmapper.git synced 2024-12-26 19:00:37 +01:00
Code Issues Projects Releases Wiki Activity

Add workaround for color.txt parsing on MinGW

Browse Source
This commit is contained in:
sfan5 2014-12-20 13:08:51 +01:00
parent 20b340e2ee
commit 722f02d121
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TileGenerator.cpp
View File

@ -264,11 +264,20 @@ void TileGenerator::parseColorsStream(std::istream &in)
} }
char name[75]; char name[75];
#ifdef __MINGW32__
// MinGW's sscanf doesn't support %hhu
unsigned int r, g, b, a, t;
#else
uint8_t r, g, b, a, t; uint8_t r, g, b, a, t;
#endif
a = 255; a = 255;
t = 0; t = 0;
#ifdef __MINGW32__
sscanf(line, "%75s %u %u %u %u %u", name, &r, &g, &b, &a, &t);
#else
sscanf(line, "%75s %hhu %hhu %hhu %hhu %hhu", name, &r, &g, &b, &a, &t); sscanf(line, "%75s %hhu %hhu %hhu %hhu %hhu", name, &r, &g, &b, &a, &t);
#endif
if(strlen(name) == 0) if(strlen(name) == 0)
break; break;
ColorEntry color = ColorEntry(r, g, b, a, t); ColorEntry color = ColorEntry(r, g, b, a, t);