Biome API: Make fallback biome stone and water, disable filler

[minetest.git] / src / emerge.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 9c5ee452ef6f0bd6389f5f181582bfdef3b2b6ee..d6bda731a2e8ad21e907d527e805e60f2e2e0ee2 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -494,8 +494,8 @@ void *EmergeThread::Thread()
                                        try {  // takes about 90ms with -O1 on an e3-1230v2
                                                m_server->getScriptIface()->environment_OnGenerated(
                                                                minp, maxp, mapgen->blockseed);
-                                       } catch(LuaError &e) {
-                                               m_server->setAsyncFatalError(e.what());
+                                       } catch (LuaError &e) {
+                                               m_server->setAsyncFatalError("Lua: " + std::string(e.what()));
                                        }
 
                                        EMERGE_DBG_OUT("ended up with: " << analyze_block(block));
@@ -522,7 +522,7 @@ void *EmergeThread::Thread()
                        << "----" << std::endl
                        << "\"" << e.what() << "\"" << std::endl
                        << "See debug.txt." << std::endl
-                       << "World probably saved by a newer version of " PROJECT_NAME "."
+                       << "World probably saved by a newer version of " PROJECT_NAME_C "."
                        << std::endl;
                m_server->setAsyncFatalError(err.str());
        }