(Re)spawn players within 'mapgen_limit'

[minetest.git] / src / camera.cpp

diff --git a/src/camera.cpp b/src/camera.cpp
index b119bbfbbeda6a70247a0e8fa5a0d7996a55a30e..52a42a3a9e6bbb1d8c867c77de953b99d7a7c01f 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "constants.h"
 #include "fontengine.h"
+#include "script/scripting_client.h"
 
 #define CAMERA_OFFSET_STEP 200
 
@@ -125,6 +126,10 @@ bool Camera::successfullyCreated(std::string &error_message)
        } else {
                error_message.clear();
        }
+       
+       if (g_settings->getBool("enable_client_modding")) {
+               m_client->getScript()->on_camera_ready(this);
+       }
        return error_message.empty();
 }
 
@@ -553,9 +558,10 @@ void Camera::drawNametags()
                f32 transformed_pos[4] = { pos.X, pos.Y, pos.Z, 1.0f };
                trans.multiplyWith1x4Matrix(transformed_pos);
                if (transformed_pos[3] > 0) {
+                       std::string nametag_colorless = unescape_enriched(nametag->nametag_text);
                        core::dimension2d<u32> textsize =
                                g_fontengine->getFont()->getDimension(
-                               utf8_to_wide(nametag->nametag_text).c_str());
+                               utf8_to_wide(nametag_colorless).c_str());
                        f32 zDiv = transformed_pos[3] == 0.0f ? 1.0f :
                                core::reciprocal(transformed_pos[3]);
                        v2u32 screensize = m_driver->getScreenSize();