Bring po update out of cmake again

[dragonfireclient.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index 3d4c9826497c79d15583f60a71e91ef8c76f551d..6bacb088d79578cfc493b1d569cafa51793e8738 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,16 +17,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-/*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
-*/
-
 #include "player.h"
 #include "map.h"
 #include "connection.h"
 #include "constants.h"
 #include "utility.h"
 
+
 Player::Player():
        touching_ground(false),
        in_water(false),
@@ -99,6 +96,7 @@ void Player::serialize(std::ostream &os)
        Settings args;
        args.setS32("version", 1);
        args.set("name", m_name);
+       //args.set("password", m_password);
        args.setFloat("pitch", m_pitch);
        args.setFloat("yaw", m_yaw);
        args.setV3F("position", m_position);
@@ -132,6 +130,10 @@ void Player::deSerialize(std::istream &is)
        //args.getS32("version");
        std::string name = args.get("name");
        updateName(name.c_str());
+       /*std::string password = "";
+       if(args.exists("password"))
+               password = args.get("password");
+       updatePassword(password.c_str());*/
        m_pitch = args.getFloat("pitch");
        m_yaw = args.getFloat("yaw");
        m_position = args.getV3F("position");
@@ -145,6 +147,20 @@ void Player::deSerialize(std::istream &is)
        }catch(SettingNotFoundException &e){
                hp = 20;
        }
+       /*try{
+               std::string sprivs = args.get("privs");
+               if(sprivs == "all")
+               {
+                       privs = PRIV_ALL;
+               }
+               else
+               {
+                       std::istringstream ss(sprivs);
+                       ss>>privs;
+               }
+       }catch(SettingNotFoundException &e){
+               privs = PRIV_DEFAULT;
+       }*/
 
        inventory.deSerialize(is);
 }
@@ -194,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;
@@ -218,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;
@@ -293,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;*/
 
@@ -389,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);
+                               }
+                       }*/
                }
        }
 
@@ -541,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)
@@ -557,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);
                                        }
-                               }
+                               }*/
                        }
                
                }
@@ -640,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)