TenPlus1/minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing map_meta.txt error when creating new worlds

Browse Source 
A missing map_meta.txt should be treated simply as if there were a blank file.
This commit is contained in:
kwolekr 2015-01-27 02:07:41 -05:00
parent ca217d0416
commit eeea454bff
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/map.cpp
View File

@ -3109,7 +3109,7 @@ void ServerMap::saveMapMeta()
createDirs(m_savedir); createDirs(m_savedir);
std::string fullpath = m_savedir + DIR_DELIM + "map_meta.txt"; std::string fullpath = m_savedir + DIR_DELIM "map_meta.txt";
std::ostringstream ss(std::ios_base::binary); std::ostringstream ss(std::ios_base::binary);
Settings params; Settings params;
@ -3133,19 +3133,21 @@ void ServerMap::loadMapMeta()
{ {
DSTACK(__FUNCTION_NAME); DSTACK(__FUNCTION_NAME);
std::string fullpath = m_savedir + DIR_DELIM "map_meta.txt";
std::ifstream is(fullpath.c_str(), std::ios_base::binary);
if (!is.good()) {
errorstream << "ServerMap::loadMapMeta(): "
<< "could not open" << fullpath << std::endl;
throw FileNotGoodException("Cannot open map metadata");
}
Settings params; Settings params;
std::string fullpath = m_savedir + DIR_DELIM "map_meta.txt";
if (!params.parseConfigLines(is, "[end_of_params]")) { if (fs::PathExists(fullpath)) {
throw SerializationError("ServerMap::loadMapMeta(): " std::ifstream is(fullpath.c_str(), std::ios_base::binary);
if (!is.good()) {
errorstream << "ServerMap::loadMapMeta(): "
"could not open " << fullpath << std::endl;
throw FileNotGoodException("Cannot open map metadata");
}
if (!params.parseConfigLines(is, "[end_of_params]")) {
throw SerializationError("ServerMap::loadMapMeta(): "
"[end_of_params] not found!"); "[end_of_params] not found!");
}
} }
m_emerge->loadParamsFromSettings(&params); m_emerge->loadParamsFromSettings(&params);