Fix spacing

[minetest.git] / src / game.cpp

diff --git a/src/game.cpp b/src/game.cpp
index 5b49d34c0e42a22cd00ae57101113914c10af770..6ef471c9e6e4be78cfcdf1088c5350c3ff297efe 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1034,6 +1034,7 @@ void KeyCache::populate()
        key[KeyType::INVENTORY]    = getKeySetting("keymap_inventory");
        key[KeyType::CHAT]         = getKeySetting("keymap_chat");
        key[KeyType::CMD]          = getKeySetting("keymap_cmd");
+       key[KeyType::CMD_LOCAL]    = getKeySetting("keymap_cmd_local");
        key[KeyType::CONSOLE]      = getKeySetting("keymap_console");
        key[KeyType::MINIMAP]      = getKeySetting("keymap_minimap");
        key[KeyType::FREEMOVE]     = getKeySetting("keymap_freemove");
@@ -2191,8 +2192,10 @@ bool Game::getServerContent(bool *aborted)
                        delete[] text;
                } else {
                        std::stringstream message;
-                       message.precision(3);
-                       message << gettext("Media...");
+                       std::fixed(message);
+                       message.precision(0);
+                       message << gettext("Media...") << " " << (client->mediaReceiveProgress()*100) << "%";
+                       message.precision(2);
 
                        if ((USE_CURL == 0) ||
                                        (!g_settings->getBool("enable_remote_media_server"))) {
@@ -2449,6 +2452,8 @@ void Game::processKeyInput()
                openConsole(0.2, L"");
        } else if (wasKeyDown(KeyType::CMD)) {
                openConsole(0.2, L"/");
+       } else if (wasKeyDown(KeyType::CMD_LOCAL)) {
+               openConsole(0.2, L".");
        } else if (wasKeyDown(KeyType::CONSOLE)) {
                openConsole(core::clamp(g_settings->getFloat("console_height"), 0.1f, 1.0f));
        } else if (wasKeyDown(KeyType::FREEMOVE)) {
@@ -3397,13 +3402,11 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
                        playeritem = mlist->getItem(client->getPlayerItem());
        }
 
-       if (playeritem.getDefinition(itemdef_manager).name.empty()) { // override the hand
-               InventoryList *hlist = local_inventory->getList("hand");
-               if (hlist)
-                       playeritem = hlist->getItem(0);
-       }
        const ItemDefinition &playeritem_def =
                        playeritem.getDefinition(itemdef_manager);
+       InventoryList *hlist = local_inventory->getList("hand");
+       const ItemDefinition &hand_def =
+               hlist ? hlist->getItem(0).getDefinition(itemdef_manager) : itemdef_manager->get("");
 
        v3f player_position  = player->getPosition();
        v3f camera_position  = camera->getPosition();
@@ -3416,7 +3419,7 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
        */
 
        f32 d = playeritem_def.range; // max. distance
-       f32 d_hand = itemdef_manager->get("").range;
+       f32 d_hand = hand_def.range;
 
        if (d < 0 && d_hand >= 0)
                d = d_hand;
@@ -3504,6 +3507,9 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
        } else if (pointed.type == POINTEDTHING_NODE) {
                ToolCapabilities playeritem_toolcap =
                                playeritem.getToolCapabilities(itemdef_manager);
+               if (playeritem.name.empty()) {
+                       playeritem_toolcap = *hand_def.tool_capabilities;
+               }
                handlePointingAtNode(pointed, playeritem_def, playeritem_toolcap, dtime);
        } else if (pointed.type == POINTEDTHING_OBJECT) {
                handlePointingAtObject(pointed, playeritem, player_position, show_debug);
@@ -3763,9 +3769,16 @@ void Game::handlePointingAtObject(const PointedThing &pointed, const ItemStack &
                        // Report direct punch
                        v3f objpos = runData.selected_object->getPosition();
                        v3f dir = (objpos - player_position).normalize();
+                       ItemStack item = playeritem;
+                       if (playeritem.name.empty()) {
+                               InventoryList *hlist = local_inventory->getList("hand");
+                               if (hlist) {
+                                       item = hlist->getItem(0);
+                               }
+                       }
 
                        bool disable_send = runData.selected_object->directReportPunch(
-                                       dir, &playeritem, runData.time_from_last_punch);
+                                       dir, &item, runData.time_from_last_punch);
                        runData.time_from_last_punch = 0;
 
                        if (!disable_send)
@@ -3802,7 +3815,9 @@ void Game::handleDigging(const PointedThing &pointed, const v3s16 &nodepos,
 
        // If can't dig, try hand
        if (!params.diggable) {
-               const ItemDefinition &hand = itemdef_manager->get("");
+               InventoryList *hlist = local_inventory->getList("hand");
+               const ItemDefinition &hand =
+                       hlist ? hlist->getItem(0).getDefinition(itemdef_manager) : itemdef_manager->get("");
                const ToolCapabilities *tp = hand.tool_capabilities;
 
                if (tp)
@@ -4094,7 +4109,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
                Drawing begins
        */
 
-       video::SColor skycolor = sky->getSkyColor();
+       const video::SColor &skycolor = sky->getSkyColor();
 
        TimeTaker tt_draw("mainloop: draw");
        driver->beginScene(true, true, skycolor);