Merge branch 'upstream/master'

[dragonfireclient.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index 539244709ee5a48b3be1329a5f008145565893c6..6bacb088d79578cfc493b1d569cafa51793e8738 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -23,54 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "constants.h"
 #include "utility.h"
 
-// Convert a privileges value into a human-readable string,
-// with each component separated by a comma.
-std::wstring privsToString(u64 privs)
-{
-       std::wostringstream os(std::ios_base::binary);
-       if(privs & PRIV_BUILD)
-               os<<L"build,";
-       if(privs & PRIV_TELEPORT)
-               os<<L"teleport,";
-       if(privs & PRIV_SETTIME)
-               os<<L"settime,";
-       if(privs & PRIV_PRIVS)
-               os<<L"privs,";
-       if(os.tellp())
-       {
-               // Drop the trailing comma. (Why on earth can't
-               // you truncate a C++ stream anyway???)
-               std::wstring tmp = os.str();
-               return tmp.substr(0, tmp.length() -1);
-       }
-       return os.str();
-}
-
-// Converts a comma-seperated list of privilege values into a
-// privileges value. The reverse of privsToString(). Returns
-// PRIV_INVALID if there is anything wrong with the input.
-u64 stringToPrivs(std::wstring str)
-{
-       u64 privs=0;
-       std::vector<std::wstring> pr;
-       pr=str_split(str, ',');
-       for(std::vector<std::wstring>::iterator i = pr.begin();
-               i != pr.end(); ++i)
-       {
-               if(*i == L"build")
-                       privs |= PRIV_BUILD;
-               else if(*i == L"teleport")
-                       privs |= PRIV_TELEPORT;
-               else if(*i == L"settime")
-                       privs |= PRIV_SETTIME;
-               else if(*i == L"privs")
-                       privs |= PRIV_PRIVS;
-               else
-                       return PRIV_INVALID;
-       }
-       return privs;
-}
-
 
 Player::Player():
        touching_ground(false),
@@ -79,7 +31,6 @@ Player::Player():
        swimming_up(false),
        craftresult_is_preview(true),
        hp(20),
-       privs(PRIV_DEFAULT),
        peer_id(PEER_ID_INEXISTENT),
        m_pitch(0),
        m_yaw(0),
@@ -87,7 +38,6 @@ Player::Player():
        m_position(0,0,0)
 {
        updateName("<not set>");
-       updatePassword("");
        resetInventory();
 }
 
@@ -146,13 +96,12 @@ void Player::serialize(std::ostream &os)
        Settings args;
        args.setS32("version", 1);
        args.set("name", m_name);
-       args.set("password", m_password);
+       //args.set("password", m_password);
        args.setFloat("pitch", m_pitch);
        args.setFloat("yaw", m_yaw);
        args.setV3F("position", m_position);
        args.setBool("craftresult_is_preview", craftresult_is_preview);
        args.setS32("hp", hp);
-       args.setU64("privs", privs);
 
        args.writeLines(os);
 
@@ -181,10 +130,10 @@ void Player::deSerialize(std::istream &is)
        //args.getS32("version");
        std::string name = args.get("name");
        updateName(name.c_str());
-       std::string password = "";
+       /*std::string password = "";
        if(args.exists("password"))
                password = args.get("password");
-       updatePassword(password.c_str());
+       updatePassword(password.c_str());*/
        m_pitch = args.getFloat("pitch");
        m_yaw = args.getFloat("yaw");
        m_position = args.getV3F("position");
@@ -198,7 +147,7 @@ void Player::deSerialize(std::istream &is)
        }catch(SettingNotFoundException &e){
                hp = 20;
        }
-       try{
+       /*try{
                std::string sprivs = args.get("privs");
                if(sprivs == "all")
                {
@@ -211,7 +160,7 @@ void Player::deSerialize(std::istream &is)
                }
        }catch(SettingNotFoundException &e){
                privs = PRIV_DEFAULT;
-       }
+       }*/
 
        inventory.deSerialize(is);
 }
@@ -261,7 +210,7 @@ RemotePlayer::RemotePlayer(
                // Set material
                buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
                //buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-               buf->getMaterial().setTexture(0, driver->getTexture(porting::getDataPath("player.png").c_str()));
+               buf->getMaterial().setTexture(0, driver->getTexture(getTexturePath("player.png").c_str()));
                buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
                buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
                //buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
@@ -285,7 +234,7 @@ RemotePlayer::RemotePlayer(
                // Set material
                buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
                //buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-               buf->getMaterial().setTexture(0, driver->getTexture(porting::getDataPath("player_back.png").c_str()));
+               buf->getMaterial().setTexture(0, driver->getTexture(getTexturePath("player_back.png").c_str()));
                buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
                buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
                buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
@@ -360,6 +309,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;*/
 
@@ -456,8 +407,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);
+                               }
+                       }*/
                }
        }
 
@@ -608,13 +574,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)
@@ -624,7 +590,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);
                                        }
-                               }
+                               }*/
                        }
                
                }
@@ -707,6 +673,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)