X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fplayer.h;h=d62fb611116bfddae84bd69736d68fd0833bceeb;hb=569fca53089b7b7e87b02edd44e2ad47166f7af6;hp=350b85e1ba5ba46a547729b417713a219d05200f;hpb=6599002149f58c03b807cd1378ec17278dbdc09d;p=minetest.git

diff --git a/src/player.h b/src/player.h
index 350b85e1b..d62fb6111 100644
--- a/src/player.h
+++ b/src/player.h
@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "inventory.h"
-#include "collision.h"
 
 #define PLAYERNAME_SIZE 20
 
@@ -30,13 +29,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 class Map;
+class IGameDef;
+struct CollisionInfo;
 
 class Player
 {
 public:
 
-
-	Player();
+	Player(IGameDef *gamedef);
 	virtual ~Player();
 
 	void resetInventory();
@@ -62,10 +62,7 @@ class Player
 		return m_position;
 	}
 
-	v3s16 getLightPosition() const
-	{
-		return floatToInt(m_position + v3f(0,BS+BS/2,0), BS);
-	}
+	v3s16 getLightPosition() const;
 
 	v3f getEyeOffset()
 	{
@@ -105,28 +102,32 @@ class Player
 		return m_yaw;
 	}
 
-	virtual void updateName(const char *name)
+	f32 getRadPitch()
 	{
-		snprintf(m_name, PLAYERNAME_SIZE, "%s", name);
+		return -1.0 * m_pitch * core::DEGTORAD;
 	}
 
-	virtual void wieldItem(u16 item);
-	virtual const InventoryItem *getWieldItem() const
+	f32 getRadYaw()
 	{
-		const InventoryList *list = inventory.getList("main");
-		if (list)
-			return list->getItem(m_selected_item);
-		return NULL;
+		return (m_yaw + 90.) * core::DEGTORAD;
+	}
+
+	virtual void updateName(const char *name)
+	{
+		snprintf(m_name, PLAYERNAME_SIZE, "%s", name);
 	}
 
-	const char * getName()
+	const char * getName() const
 	{
 		return m_name;
 	}
 
 	virtual bool isLocal() const = 0;
 
-	virtual void updateLight(u8 light_at_pos) {};
+	virtual void updateLight(u8 light_at_pos)
+	{
+		light = light_at_pos;
+	}
 	
 	// NOTE: Use peer_id == 0 for disconnected
 	/*virtual bool isClientConnected() { return false; }
@@ -147,21 +148,21 @@ class Player
 	bool in_water_stable;
 	bool is_climbing;
 	bool swimming_up;
-	bool is_frozen;
 	
+	u8 light;
+
 	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:
+	IGameDef *m_gamedef;
+
 	char m_name[PLAYERNAME_SIZE];
-	u16 m_selected_item;
 	f32 m_pitch;
 	f32 m_yaw;
 	v3f m_speed;
@@ -171,138 +172,6 @@ class Player
 
 };
 
-/*
-	Player on the server
-*/
-
-class ServerRemotePlayer : public Player
-{
-public:
-	ServerRemotePlayer()
-	{
-	}
-	virtual ~ServerRemotePlayer()
-	{
-	}
-
-	virtual bool isLocal() const
-	{
-		return false;
-	}
-
-	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:
-	RemotePlayer(
-		scene::ISceneNode* parent=NULL,
-		IrrlichtDevice *device=NULL,
-		s32 id=0);
-	
-	virtual ~RemotePlayer();
-
-	/*
-		ISceneNode methods
-	*/
-
-	virtual void OnRegisterSceneNode()
-	{
-		if (IsVisible)
-			SceneManager->registerNodeForRendering(this);
-
-		ISceneNode::OnRegisterSceneNode();
-	}
-
-	virtual void render()
-	{
-		// Do nothing
-	}
-	
-	virtual const core::aabbox3d<f32>& getBoundingBox() const
-	{
-		return m_box;
-	}
-
-	void setPosition(const v3f &position)
-	{
-		m_oldpos = m_showpos;
-		
-		if(m_pos_animation_time < 0.001 || m_pos_animation_time > 1.0)
-			m_pos_animation_time = m_pos_animation_time_counter;
-		else
-			m_pos_animation_time = m_pos_animation_time * 0.9
-					+ m_pos_animation_time_counter * 0.1;
-		m_pos_animation_time_counter = 0;
-		m_pos_animation_counter = 0;
-		
-		Player::setPosition(position);
-		//ISceneNode::setPosition(position);
-	}
-
-	virtual void setYaw(f32 yaw)
-	{
-		Player::setYaw(yaw);
-		ISceneNode::setRotation(v3f(0, -yaw, 0));
-	}
-
-	bool isLocal() const
-	{
-		return false;
-	}
-
-	void updateName(const char *name);
-
-	virtual void updateLight(u8 light_at_pos)
-	{
-		if(m_node == NULL)
-			return;
-
-		u8 li = decode_light(light_at_pos);
-		video::SColor color(255,li,li,li);
-
-		scene::IMesh *mesh = m_node->getMesh();
-		
-		u16 mc = mesh->getMeshBufferCount();
-		for(u16 j=0; j<mc; j++)
-		{
-			scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-			video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices();
-			u16 vc = buf->getVertexCount();
-			for(u16 i=0; i<vc; i++)
-			{
-				vertices[i].Color = color;
-			}
-		}
-	}
-	
-	void move(f32 dtime, Map &map, f32 pos_max_d);
-
-private:
-	scene::IMeshSceneNode *m_node;
-	scene::ITextSceneNode* m_text;
-	core::aabbox3d<f32> m_box;
-
-	v3f m_oldpos;
-	f32 m_pos_animation_counter;
-	f32 m_pos_animation_time;
-	f32 m_pos_animation_time_counter;
-	v3f m_showpos;
-};
-
-#endif // !SERVER
-
 #ifndef SERVER
 struct PlayerControl
 {
@@ -354,7 +223,7 @@ struct PlayerControl
 class LocalPlayer : public Player
 {
 public:
-	LocalPlayer();
+	LocalPlayer(IGameDef *gamedef);
 	virtual ~LocalPlayer();
 
 	bool isLocal() const