Several Enhancements

diff --git a/builtin/common/chatcommands.lua b/builtin/common/chatcommands.lua
index 709c3d00a7738b6323e4110702b46c6a5df70313..bf989db7d1f8fd53349a18f20a421a974fea2758 100644 (file)
--- a/builtin/common/chatcommands.lua
+++ b/builtin/common/chatcommands.lua
@@ -68,7 +68,7 @@ if INIT == "client" then
                                        end
                                end
                        end
-                       return false, "Invalid usage. (See /help " .. command .. ")"
+                       return false, "Invalid usage. (See .help " .. command .. ")"
                end
                core.register_chatcommand(command, def)
        end

diff --git a/src/client/game.cpp b/src/client/game.cpp
index 894f92b460d04f8041fd8b58dbd0f17234ef7ad1..2e8a50294d96e36571320ae01c20670aa4b5f7c2 100644 (file)
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -116,6 +116,8 @@ Game::Game() :
                &updateAllMapBlocksCallback, this);
        g_settings->registerChangedCallback("fullbright",
                &updateAllMapBlocksCallback, this);
+       g_settings->registerChangedCallback("node_esp_nodes",
+               &updateAllMapBlocksCallback, this);
                
        readSettings();
 
@@ -182,6 +184,8 @@ Game::~Game()
                &updateAllMapBlocksCallback, this);
        g_settings->deregisterChangedCallback("fullbright",
                &updateAllMapBlocksCallback, this);
+       g_settings->deregisterChangedCallback("node_esp_nodes",
+               &updateAllMapBlocksCallback, this);
 }
 
 bool Game::startup(bool *kill,

diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp
index 68770ec198bc0f17ce2fd0522606d69b977a5158..9f1a104ba7cfead4af92241b87ab55b5b05842f8 100644 (file)
--- a/src/client/minimap.cpp
+++ b/src/client/minimap.cpp
@@ -474,8 +474,8 @@ void Minimap::drawMinimap()
        core::matrix4 oldViewMat = driver->getTransform(video::ETS_VIEW);
 
        driver->setViewPort(core::rect<s32>(
-               screensize.X - size - 10, 10,
-               screensize.X - 10, size + 10));
+               screensize.X - size * 2 - 10, 10,
+               screensize.X - size - 10, size + 10));
        driver->setTransform(video::ETS_PROJECTION, core::matrix4());
        driver->setTransform(video::ETS_VIEW, core::matrix4());
 

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 9c3cfe6657f51b2b8dac238cb122057c822dd6c3..4c3d311db9f8ddffc6206eeac2ff95456571c3ee 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -320,7 +320,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("arm_inertia", "true");
 
        settings->setDefault("enable_minimap", "true");
-       settings->setDefault("minimap_shape_round", "true");
+       settings->setDefault("minimap_shape_round", "false");
        settings->setDefault("minimap_double_scan_height", "true");
 
        // Effects

diff --git a/src/script/lua_api/CMakeLists.txt b/src/script/lua_api/CMakeLists.txt
index f6963f707cad037b17bd4df630a72463a63952a5..3f1b890859a459d7f4b76708d3ff014e57af83eb 100644 (file)
--- a/src/script/lua_api/CMakeLists.txt
+++ b/src/script/lua_api/CMakeLists.txt
@@ -6,7 +6,6 @@ set(common_SCRIPT_LUA_API_SRCS
        ${CMAKE_CURRENT_SOURCE_DIR}/l_env.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/l_http.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/l_inventory.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/l_inventoryaction.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/l_item.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/l_itemstackmeta.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/l_mapgen.cpp
@@ -30,6 +29,7 @@ set(client_SCRIPT_LUA_API_SRCS
        ${CMAKE_CURRENT_SOURCE_DIR}/l_camera.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/l_client.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/l_clientobject.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}/l_inventoryaction.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/l_localplayer.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/l_mainmenu.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/l_minimap.cpp