merged Mac OSX build fix from minetest-delta

[dragonfireclient.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 5ab027e0abeec6ddad486e440e219f2db656a506..a7a2433ce3d52f10f461c7d349f921958d703e46 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -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,32 +17,32 @@ 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>
-*/
-
 #ifndef PLAYER_HEADER
 #define PLAYER_HEADER
 
 #include "common_irrlicht.h"
 #include "inventory.h"
+#include "collision.h"
 
 #define PLAYERNAME_SIZE 20
 
-#define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,"
+#define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
+
 
 class Map;
 
 class Player
 {
 public:
+
+
        Player();
        virtual ~Player();
 
        void resetInventory();
 
        //void move(f32 dtime, Map &map);
-       virtual void move(f32 dtime, Map &map) = 0;
+       virtual void move(f32 dtime, Map &map, f32 pos_max_d) = 0;
 
        v3f getSpeed()
        {
@@ -114,10 +114,18 @@ class Player
        void deSerialize(std::istream &is);
 
        bool touching_ground;
+       // This oscillates so that the player jumps a bit above the surface
        bool in_water;
+       // This is more stable and defines the maximum speed of the player
+       bool in_water_stable;
+       bool swimming_up;
        
        Inventory inventory;
 
+       bool craftresult_is_preview;
+
+       u16 hp;
+
        u16 peer_id;
 
 protected:
@@ -126,8 +134,15 @@ class Player
        f32 m_yaw;
        v3f m_speed;
        v3f m_position;
+
+public:
+
 };
 
+/*
+       Player on the server
+*/
+
 class ServerRemotePlayer : public Player
 {
 public:
@@ -143,15 +158,19 @@ class ServerRemotePlayer : public Player
                return false;
        }
 
-       virtual void move(f32 dtime, Map &map)
+       virtual void move(f32 dtime, Map &map, f32 pos_max_d)
        {
        }
-
+       
 private:
 };
 
 #ifndef SERVER
 
+/*
+       All the other players on the client are these
+*/
+
 class RemotePlayer : public Player, public scene::ISceneNode
 {
 public:
@@ -236,7 +255,7 @@ class RemotePlayer : public Player, public scene::ISceneNode
                }
        }
        
-       void move(f32 dtime, Map &map);
+       void move(f32 dtime, Map &map, f32 pos_max_d);
 
 private:
        scene::IMeshSceneNode *m_node;
@@ -262,7 +281,8 @@ struct PlayerControl
                left = false;
                right = false;
                jump = false;
-               superspeed = false;
+               aux1 = false;
+               sneak = false;
                pitch = 0;
                yaw = 0;
        }
@@ -272,7 +292,8 @@ struct PlayerControl
                bool a_left,
                bool a_right,
                bool a_jump,
-               bool a_superspeed,
+               bool a_aux1,
+               bool a_sneak,
                float a_pitch,
                float a_yaw
        )
@@ -282,7 +303,8 @@ struct PlayerControl
                left = a_left;
                right = a_right;
                jump = a_jump;
-               superspeed = a_superspeed;
+               aux1 = a_aux1;
+               sneak = a_sneak;
                pitch = a_pitch;
                yaw = a_yaw;
        }
@@ -291,7 +313,8 @@ struct PlayerControl
        bool left;
        bool right;
        bool jump;
-       bool superspeed;
+       bool aux1;
+       bool sneak;
        float pitch;
        float yaw;
 };
@@ -307,13 +330,19 @@ class LocalPlayer : public Player
                return true;
        }
 
-       void move(f32 dtime, Map &map);
+       void move(f32 dtime, Map &map, f32 pos_max_d,
+                       core::list<CollisionInfo> *collision_info);
+       void move(f32 dtime, Map &map, f32 pos_max_d);
 
        void applyControl(float dtime);
        
        PlayerControl control;
 
 private:
+       // This is used for determining the sneaking range
+       v3s16 m_sneak_node;
+       // Whether the player is allowed to sneak
+       bool m_sneak_node_exists;
 };
 #endif // !SERVER