X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flocalplayer.h;h=182b51d4d5b2c0144a3c069875c187ced576af34;hb=7bbd716426bf989bf071e2322a9b797cc5f78acb;hp=fb57e6538e1fbf93fa95c08e1f2d7b6d5c51c8db;hpb=b17d3e7ad7e59a10df50277c15174529f20d0bed;p=dragonfireclient.git

diff --git a/src/localplayer.h b/src/localplayer.h
index fb57e6538..182b51d4d 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 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 Lesser General Public License as published by
@@ -21,87 +21,109 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define LOCALPLAYER_HEADER
 
 #include "player.h"
+#include "environment.h"
+#include <list>
 
-struct PlayerControl
-{
-	PlayerControl()
-	{
-		up = false;
-		down = false;
-		left = false;
-		right = false;
-		jump = false;
-		aux1 = false;
-		sneak = false;
-		pitch = 0;
-		yaw = 0;
-	}
-	PlayerControl(
-		bool a_up,
-		bool a_down,
-		bool a_left,
-		bool a_right,
-		bool a_jump,
-		bool a_aux1,
-		bool a_sneak,
-		float a_pitch,
-		float a_yaw
-	)
-	{
-		up = a_up;
-		down = a_down;
-		left = a_left;
-		right = a_right;
-		jump = a_jump;
-		aux1 = a_aux1;
-		sneak = a_sneak;
-		pitch = a_pitch;
-		yaw = a_yaw;
-	}
-	bool up;
-	bool down;
-	bool left;
-	bool right;
-	bool jump;
-	bool aux1;
-	bool sneak;
-	float pitch;
-	float yaw;
-};
+class Client;
+class Environment;
+class GenericCAO;
+class ClientActiveObject;
+
+enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM};  // no local animation, walking, digging, both
 
 class LocalPlayer : public Player
 {
 public:
-	LocalPlayer(IGameDef *gamedef);
+	LocalPlayer(Client *gamedef, const char *name);
 	virtual ~LocalPlayer();
 
 	bool isLocal() const
 	{
 		return true;
 	}
-	
-	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);
+
+	ClientActiveObject *parent;
+
+	bool got_teleported;
+	bool isAttached;
+	bool touching_ground;
+	// This oscillates so that the player jumps a bit above the surface
+	bool in_liquid;
+	// This is more stable and defines the maximum speed of the player
+	bool in_liquid_stable;
+	// Gets the viscosity of water to calculate friction
+	u8 liquid_viscosity;
+	bool is_climbing;
+	bool swimming_vertical;
+
+	float physics_override_speed;
+	float physics_override_jump;
+	float physics_override_gravity;
+	bool physics_override_sneak;
+	bool physics_override_sneak_glitch;
+
+	v3f overridePosition;
+
+	void move(f32 dtime, Environment *env, f32 pos_max_d);
+	void move(f32 dtime, Environment *env, f32 pos_max_d,
+			std::vector<CollisionInfo> *collision_info);
 
 	void applyControl(float dtime);
 
 	v3s16 getStandingNodePos();
-	
-	PlayerControl control;
+
+	// Used to check if anything changed and prevent sending packets if not
+	v3f last_position;
+	v3f last_speed;
+	float last_pitch;
+	float last_yaw;
+	unsigned int last_keyPressed;
+
+	float camera_impact;
+
+	int last_animation;
+	float last_animation_speed;
+
+	std::string hotbar_image;
+	std::string hotbar_selected_image;
+
+	video::SColor light_color;
+
+	float hurt_tilt_timer;
+	float hurt_tilt_strength;
+
+	GenericCAO* getCAO() const {
+		return m_cao;
+	}
+
+	void setCAO(GenericCAO* toset) {
+		assert( m_cao == NULL ); // Pre-condition
+		m_cao = toset;
+	}
+
+	u32 maxHudId() const { return hud.size(); }
 
 private:
+	void accelerateHorizontal(const v3f &target_speed, const f32 max_increase);
+	void accelerateVertical(const v3f &target_speed, const f32 max_increase);
+
 	// This is used for determining the sneaking range
 	v3s16 m_sneak_node;
 	// Whether the player is allowed to sneak
 	bool m_sneak_node_exists;
+	// Whether recalculation of the sneak node is needed
+	bool m_need_to_get_new_sneak_node;
+	// Stores the max player uplift by m_sneak_node and is updated
+	// when m_need_to_get_new_sneak_node == true
+	f32 m_sneak_node_bb_ymax;
 	// Node below player, used to determine whether it has been removed,
 	// and its old type
 	v3s16 m_old_node_below;
 	std::string m_old_node_below_type;
-	// Whether recalculation of the sneak node is needed
-	bool m_need_to_get_new_sneak_node;
 	bool m_can_jump;
+
+	GenericCAO* m_cao;
+	Client *m_gamedef;
 };
 
 #endif