From dc6966cb9d5f6b31ad7fb45d33aaa21192c3b89c Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 11 Apr 2011 00:06:07 +0300
Subject: [PATCH] added ignoring of map_meta.txt to better support old maps
---
src/map.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/map.cpp b/src/map.cpp
index 7fe58dc11..5ab7e5b02 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1834,16 +1834,16 @@ ServerMap::ServerMap(std::string savedir):
}
else
{
- // Load map metadata (seed, chunksize)
- loadMapMeta();
-
try{
+ // Load map metadata (seed, chunksize)
+ loadMapMeta();
+
// Load chunk metadata
loadChunkMeta();
}
catch(FileNotGoodException &e){
dstream<<DTIME<<"WARNING: Server: Could not load "
- <<"chunk metafile. Disabling chunk-based "
+ <<"metafile(s). Disabling chunk-based "
<<"generation."<<std::endl;
m_chunksize = 0;
}
@@ -4967,7 +4967,7 @@ void ServerMap::loadMapMeta()
{
DSTACK(__FUNCTION_NAME);
- dstream<<"INFO: ServerMap::loadMapMeta(): Loading chunk metadata"
+ dstream<<"INFO: ServerMap::loadMapMeta(): Loading map metadata"
<<std::endl;
std::string fullpath = m_savedir + "/map_meta.txt";
@@ -4976,7 +4976,7 @@ void ServerMap::loadMapMeta()
{
dstream<<"ERROR: ServerMap::loadMapMeta(): "
<<"could not open"<<fullpath<<std::endl;
- throw FileNotGoodException("Cannot open chunk metadata");
+ throw FileNotGoodException("Cannot open map metadata");
}
Settings params;
--
GitLab