tuned lava/universal damage code

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

diff --git a/src/player.cpp b/src/player.cpp
index efb2f34473341910e80d647bc0d21fc4a92f3afa..d59ae7049d3a561357942f9cf04f7b11cd2b34a9 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -29,9 +29,11 @@ Player::Player():
        in_water(false),
        in_water_stable(false),
        swimming_up(false),
+       inventory_backup(NULL),
        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),
@@ -43,6 +45,12 @@ Player::Player():
 
 Player::~Player()
 {
+       delete inventory_backup;
+}
+
+void Player::wieldItem(u16 item)
+{
+       m_selected_item = item;
 }
 
 void Player::resetInventory()
@@ -102,13 +110,17 @@ void Player::serialize(std::ostream &os)
        args.setV3F("position", m_position);
        args.setBool("craftresult_is_preview", craftresult_is_preview);
        args.setS32("hp", hp);
-       args.setU64("privs", privs);
 
        args.writeLines(os);
 
        os<<"PlayerArgsEnd\n";
-
-       inventory.serialize(os);
+       
+       // If actual inventory is backed up due to creative mode, save it
+       // instead of the dummy creative mode inventory
+       if(inventory_backup)
+               inventory_backup->serialize(os);
+       else
+               inventory.serialize(os);
 }
 
 void Player::deSerialize(std::istream &is)
@@ -310,6 +322,8 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
        v3f oldpos = position;
        v3s16 oldpos_i = floatToInt(oldpos, BS);
 
+       v3f old_speed = m_speed;
+
        /*std::cout<<"oldpos_i=("<<oldpos_i.X<<","<<oldpos_i.Y<<","
                        <<oldpos_i.Z<<")"<<std::endl;*/
 
@@ -341,13 +355,13 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
                if(in_water)
                {
                        v3s16 pp = floatToInt(position + v3f(0,BS*0.1,0), BS);
-                       in_water = content_liquid(map.getNode(pp).d);
+                       in_water = content_liquid(map.getNode(pp).getContent());
                }
                // If not in water, the threshold of going in is at lower y
                else
                {
                        v3s16 pp = floatToInt(position + v3f(0,BS*0.5,0), BS);
-                       in_water = content_liquid(map.getNode(pp).d);
+                       in_water = content_liquid(map.getNode(pp).getContent());
                }
        }
        catch(InvalidPositionException &e)
@@ -360,13 +374,28 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
        */
        try{
                v3s16 pp = floatToInt(position + v3f(0,0,0), BS);
-               in_water_stable = content_liquid(map.getNode(pp).d);
+               in_water_stable = content_liquid(map.getNode(pp).getContent());
        }
        catch(InvalidPositionException &e)
        {
                in_water_stable = false;
        }
 
+       /*
+               Check if player is climbing
+       */
+
+       try {
+               v3s16 pp = floatToInt(position + v3f(0,0.5*BS,0), BS);
+               v3s16 pp2 = floatToInt(position + v3f(0,-0.2*BS,0), BS);
+               is_climbing = ((content_features(map.getNode(pp).getContent()).climbable ||
+                               content_features(map.getNode(pp2).getContent()).climbable) && !free_move);
+       }
+       catch(InvalidPositionException &e)
+       {
+               is_climbing = false;
+       }
+
        /*
                Collision uncertainty radius
                Make it a bit larger than the maximum distance of movement
@@ -406,8 +435,23 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
                if(position.Y < min_y)
                {
                        position.Y = min_y;
+
+                       //v3f old_speed = m_speed;
+
                        if(m_speed.Y < 0)
                                m_speed.Y = 0;
+
+                       /*if(collision_info)
+                       {
+                               // Report fall collision
+                               if(old_speed.Y < m_speed.Y - 0.1)
+                               {
+                                       CollisionInfo info;
+                                       info.t = COLLISION_FALL;
+                                       info.speed = m_speed.Y - old_speed.Y;
+                                       collision_info->push_back(info);
+                               }
+                       }*/
                }
        }
 
@@ -438,7 +482,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
                Player is allowed to jump when this is true.
        */
        touching_ground = false;
-       
+
        /*std::cout<<"Checking collisions for ("
                        <<oldpos_i.X<<","<<oldpos_i.Y<<","<<oldpos_i.Z
                        <<") -> ("
@@ -454,7 +498,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
        {
                try{
                        // Player collides into walkable nodes
-                       if(content_walkable(map.getNode(v3s16(x,y,z)).d) == false)
+                       if(content_walkable(map.getNode(v3s16(x,y,z)).getContent()) == false)
                                continue;
                }
                catch(InvalidPositionException &e)
@@ -558,13 +602,13 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
                        */
                        if(other_axes_overlap && main_axis_collides)
                        {
-                               v3f old_speed = m_speed;
+                               //v3f old_speed = m_speed;
 
                                m_speed -= m_speed.dotProduct(dirs[i]) * dirs[i];
                                position -= position.dotProduct(dirs[i]) * dirs[i];
                                position += oldpos.dotProduct(dirs[i]) * dirs[i];
                                
-                               if(collision_info)
+                               /*if(collision_info)
                                {
                                        // Report fall collision
                                        if(old_speed.Y < m_speed.Y - 0.1)
@@ -574,7 +618,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
                                                info.speed = m_speed.Y - old_speed.Y;
                                                collision_info->push_back(info);
                                        }
-                               }
+                               }*/
                        }
                
                }
@@ -617,10 +661,10 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
 
                        try{
                                // The node to be sneaked on has to be walkable
-                               if(content_walkable(map.getNode(p).d) == false)
+                               if(content_walkable(map.getNode(p).getContent()) == false)
                                        continue;
                                // And the node above it has to be nonwalkable
-                               if(content_walkable(map.getNode(p+v3s16(0,1,0)).d) == true)
+                               if(content_walkable(map.getNode(p+v3s16(0,1,0)).getContent()) == true)
                                        continue;
                        }
                        catch(InvalidPositionException &e)
@@ -657,6 +701,21 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
                Set new position
        */
        setPosition(position);
+       
+       /*
+               Report collisions
+       */
+       if(collision_info)
+       {
+               // Report fall collision
+               if(old_speed.Y < m_speed.Y - 0.1)
+               {
+                       CollisionInfo info;
+                       info.t = COLLISION_FALL;
+                       info.speed = m_speed.Y - old_speed.Y;
+                       collision_info->push_back(info);
+               }
+       }
 }
 
 void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d)
@@ -685,7 +744,7 @@ void LocalPlayer::applyControl(float dtime)
        bool fast_move = g_settings.getBool("fast_move");
        bool continuous_forward = g_settings.getBool("continuous_forward");
 
-       if(free_move)
+       if(free_move || is_climbing)
        {
                v3f speed = getSpeed();
                speed.Y = 0;
@@ -712,6 +771,12 @@ void LocalPlayer::applyControl(float dtime)
                                speed.Y = -walkspeed_max;
                        setSpeed(speed);
                }
+               else if(is_climbing)
+               {
+                       v3f speed = getSpeed();
+                       speed.Y = -3*BS;
+                       setSpeed(speed);
+               }
                else
                {
                        // If not free movement but fast is allowed, aux1 is
@@ -774,6 +839,12 @@ void LocalPlayer::applyControl(float dtime)
                        setSpeed(speed);
                        swimming_up = true;
                }
+               else if(is_climbing)
+               {
+                       v3f speed = getSpeed();
+                       speed.Y = 3*BS;
+                       setSpeed(speed);
+               }
        }
 
        // The speed of the player (Y is ignored)