X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fplayer.h;h=9a6ad93bfacad954121dda8964f27c749cdf8cc7;hb=42134bb49eaa5116838a2c188c432c8b9420dff8;hp=9330bdd54300e0a7c6a25fb5fc2e2a89fc8fb629;hpb=3fb0d2fb65c968f91c333a1d31d2d7a1a02ab7d1;p=dragonfireclient.git diff --git a/src/player.h b/src/player.h index 9330bdd54..9a6ad93bf 100644 --- a/src/player.h +++ b/src/player.h @@ -1,6 +1,6 @@ /* Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Copyright (C) 2010-2011 celeron55, Perttu Ahola 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,28 +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 -*/ - #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-_" + + 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() { @@ -58,7 +62,20 @@ class Player return m_position; } - virtual void setPosition(v3f position) + v3s16 getLightPosition() const + { + return floatToInt(m_position + v3f(0,BS+BS/2,0), BS); + } + + v3f getEyePosition() + { + // This is at the height of the eyes of the current figure + // return m_position + v3f(0, BS+BS/2, 0); + // This is more like in minecraft + return m_position + v3f(0,BS+(5*BS)/8,0); + } + + virtual void setPosition(const v3f &position) { m_position = position; } @@ -88,6 +105,15 @@ class Player snprintf(m_name, PLAYERNAME_SIZE, "%s", name); } + virtual void wieldItem(u16 item); + virtual const InventoryItem *getWieldItem() const + { + const InventoryList *list = inventory.getList("main"); + if (list) + return list->getItem(m_selected_item); + return NULL; + } + const char * getName() { return m_name; @@ -100,27 +126,52 @@ class Player // NOTE: Use peer_id == 0 for disconnected /*virtual bool isClientConnected() { return false; } virtual void setClientConnected(bool) {}*/ + + /* + serialize() writes a bunch of text that can contain + any characters except a '\0', and such an ending that + deSerialize stops reading exactly at the right point. + */ + void serialize(std::ostream &os); + 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 is_climbing; + bool swimming_up; Inventory inventory; + // Actual inventory is backed up here when creative mode is used + Inventory *inventory_backup; + + bool craftresult_is_preview; + + u16 hp; u16 peer_id; protected: char m_name[PLAYERNAME_SIZE]; + u16 m_selected_item; f32 m_pitch; f32 m_yaw; v3f m_speed; v3f m_position; + +public: + }; +/* + Player on the server +*/ + class ServerRemotePlayer : public Player { public: - /*ServerRemotePlayer(bool client_connected): - m_client_connected(client_connected)*/ ServerRemotePlayer() { } @@ -133,27 +184,19 @@ class ServerRemotePlayer : public Player return false; } - virtual void move(f32 dtime, Map &map) - { - } - - /*virtual bool isClientConnected() + virtual void move(f32 dtime, Map &map, f32 pos_max_d) { - return m_client_connected; } - virtual void setClientConnected(bool client_connected) - { - m_client_connected = client_connected; - } - - // This - bool m_client_connected;*/ - + private: }; #ifndef SERVER +/* + All the other players on the client are these +*/ + class RemotePlayer : public Player, public scene::ISceneNode { public: @@ -186,7 +229,7 @@ class RemotePlayer : public Player, public scene::ISceneNode return m_box; } - void setPosition(v3f position) + void setPosition(const v3f &position) { m_oldpos = m_showpos; @@ -238,7 +281,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; @@ -252,7 +295,7 @@ class RemotePlayer : public Player, public scene::ISceneNode v3f m_showpos; }; -#endif +#endif // !SERVER #ifndef SERVER struct PlayerControl @@ -264,7 +307,8 @@ struct PlayerControl left = false; right = false; jump = false; - superspeed = false; + aux1 = false; + sneak = false; pitch = 0; yaw = 0; } @@ -274,7 +318,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 ) @@ -284,7 +329,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; } @@ -293,7 +339,8 @@ struct PlayerControl bool left; bool right; bool jump; - bool superspeed; + bool aux1; + bool sneak; float pitch; float yaw; }; @@ -309,13 +356,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 *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