adrido/minetest-mapper-cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve parsing of heightmap colors file

Browse Source 
Error detection was not entirely correct
This commit is contained in:
Rogier 2016-01-13 10:30:18 +01:00
parent f908282a16
commit 56af6644fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TileGenerator.cpp
View File

@ -706,7 +706,7 @@ void TileGenerator::parseHeightMapColorsLine(const std::string &line, std::strin
iline.clear(); iline.clear();
iline >> std::ws; iline >> std::ws;
iline >> value >> std::ws; iline >> value >> std::ws;
if (iline.good()) { if (!iline.fail()) {
if (value == "-oo" || (c == '-' && value=="oo")) if (value == "-oo" || (c == '-' && value=="oo"))
height[i] = INT_MIN; height[i] = INT_MIN;
else if (value == "oo" || value == "+oo") else if (value == "oo" || value == "+oo")
@ -755,7 +755,7 @@ void TileGenerator::parseHeightMapNodesLine(const std::string &line, std::string
m_nodeColors[name] = ColorEntry(0,0,0,255,1,0); // Dummy entry - but must not be transparent m_nodeColors[name] = ColorEntry(0,0,0,255,1,0); // Dummy entry - but must not be transparent
} }
// Don't care if not at eof (== really eol). We might be reading a colors.txt file... // Don't care if not at eof (== really eol). We might be reading a colors.txt file...
if (iline.bad()) { if (iline.fail()) {
std::cerr << filename << ":" << linenr << ": bad line in heightmap nodes file (" << line << ")" << std::endl; std::cerr << filename << ":" << linenr << ": bad line in heightmap nodes file (" << line << ")" << std::endl;
return; return;
} }