Set server_announce to world.mt and respect modes when changing subgame

[minetest.git] / src / emerge.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 89153cdb6017be87b1edfc3fd9c106c268658f38..de9a16ac749c0500def8413d335c376f4b2edbf3 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -28,7 +28,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "util/container.h"
 #include "util/thread.h"
-#include "main.h"
 #include "constants.h"
 #include "voxel.h"
 #include "config.h"
@@ -519,20 +518,22 @@ void *EmergeThread::Thread()
        }
        catch (VersionMismatchException &e) {
                std::ostringstream err;
-               err << "World data version mismatch in MapBlock "<<PP(last_tried_pos)<<std::endl;
-               err << "----"<<std::endl;
-               err << "\""<<e.what()<<"\""<<std::endl;
-               err << "See debug.txt."<<std::endl;
-               err << "World probably saved by a newer version of Minetest."<<std::endl;
+               err << "World data version mismatch in MapBlock " << PP(last_tried_pos) << std::endl
+                       << "----" << std::endl
+                       << "\"" << e.what() << "\"" << std::endl
+                       << "See debug.txt." << std::endl
+                       << "World probably saved by a newer version of " PROJECT_NAME_C "."
+                       << std::endl;
                m_server->setAsyncFatalError(err.str());
        }
        catch (SerializationError &e) {
                std::ostringstream err;
-               err << "Invalid data in MapBlock "<<PP(last_tried_pos)<<std::endl;
-               err << "----"<<std::endl;
-               err << "\""<<e.what()<<"\""<<std::endl;
-               err << "See debug.txt."<<std::endl;
-               err << "You can ignore this using [ignore_world_load_errors = true]."<<std::endl;
+               err << "Invalid data in MapBlock " << PP(last_tried_pos) << std::endl
+                       << "----" << std::endl
+                       << "\"" << e.what() << "\"" << std::endl
+                       << "See debug.txt." << std::endl
+                       << "You can ignore this using [ignore_world_load_errors = true]."
+                       << std::endl;
                m_server->setAsyncFatalError(err.str());
        }