Commented out debug statements again

[oweals/minetest.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index be478e8693efce74dfe42d21cb2a5bb1403e71db..7cfdfebb69d45ebb739f50c43b51b5bd750b9e5a 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -33,6 +33,7 @@ Player::Player():
        craftresult_is_preview(true),
        hp(20),
        peer_id(PEER_ID_INEXISTENT),
+       m_selected_item(0),
        m_pitch(0),
        m_yaw(0),
        m_speed(0,0,0),
@@ -47,6 +48,11 @@ Player::~Player()
        delete inventory_backup;
 }
 
+void Player::wieldItem(u16 item)
+{
+       m_selected_item = item;
+}
+
 void Player::resetInventory()
 {
        inventory.clear();
@@ -324,7 +330,18 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
        /*
                Calculate new position
        */
-       position += m_speed * dtime;
+       if(is_frozen) {
+               // Still move very slowly so as not to feel all completely stuck
+               position += m_speed * dtime * 0.001;
+       }
+       else {
+               position += m_speed * dtime;
+       }
+       
+       /*
+               If the player enters an unloaded chunk this is set to true.
+       */
+       is_frozen = false;
 
        // Skip collision detection if a special movement mode is used
        bool free_move = g_settings.getBool("free_move");
@@ -497,8 +514,11 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
                }
                catch(InvalidPositionException &e)
                {
-                       // Doing nothing here will block the player from
-                       // walking over map borders
+                       if(!is_frozen) {
+                               // freeze when entering unloaded areas
+                               is_frozen = true;
+                       }
+                       continue;
                }
 
                core::aabbox3d<f32> nodebox = getNodeBox(v3s16(x,y,z), BS);