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

Use Settings class to obtain world chunksize

Browse Source
This commit is contained in:
Rogier 2015-12-16 15:31:07 +01:00
parent fcedce3e13
commit 4e8441d322
1 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
TileGenerator.cpp
View File

@ -20,6 +20,7 @@
#include <cerrno> #include <cerrno>
#include <cstring> #include <cstring>
#include "config.h" #include "config.h"
#include "Settings.h"
#include "PlayerAttributes.h" #include "PlayerAttributes.h"
#include "TileGenerator.h" #include "TileGenerator.h"
#include "ZlibDecompressor.h" #include "ZlibDecompressor.h"
@ -714,38 +715,8 @@ void TileGenerator::parseHeightMapNodesLine(const std::string &line, std::string
std::string TileGenerator::getWorldDatabaseBackend(const std::string &input) std::string TileGenerator::getWorldDatabaseBackend(const std::string &input)
{ {
string backend; Settings world_mt(input + PATH_SEPARATOR + "world.mt");
return world_mt.get("backend", "sqlite3");
std::string worldFile = input + PATH_SEPARATOR + "world.mt";
ifstream in;
in.open(worldFile.c_str(), ifstream::in);
if (!in.is_open())
throw std::runtime_error(std::string("Failed to open world.mt file '") + worldFile + "'");
std::string line;
int linenr = 0;
for (std::getline(in,line); in.good(); std::getline(in,line)) {
linenr++;
istringstream iline;
iline.str(line);
iline >> std::skipws;
string variable;
string eq;
iline >> variable;
if (variable != "backend")
continue;
iline >> eq;
iline >> backend;
if (in.fail() || eq != "=") {
ostringstream oss;
oss << "Error parsing 'backend' in world.mt file at line " << linenr;
throw std::runtime_error(oss.str());
}
}
in.close();
if (backend == "")
backend = "sqlite3";
return backend;
} }
int TileGenerator::getMapChunkSize(const std::string &input) int TileGenerator::getMapChunkSize(const std::string &input)