projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add LuaSecureRandom
[oweals/minetest.git]
/
src
/
localplayer.h
diff --git
a/src/localplayer.h
b/src/localplayer.h
index 38e7a4cd9e739ba0955dde3fbaf60f20dffe36ac..40a7f089edf6ab1112a96ba9452d7e507b7b11ad 100644
(file)
--- a/
src/localplayer.h
+++ b/
src/localplayer.h
@@
-24,7
+24,7
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include <list>
class Environment;
#include <list>
class Environment;
-
+class GenericCAO;
class ClientActiveObject;
enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM}; // no local animation, walking, digging, both
class ClientActiveObject;
enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM}; // no local animation, walking, digging, both
@@
-32,14
+32,14
@@
enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM}; // no local
class LocalPlayer : public Player
{
public:
class LocalPlayer : public Player
{
public:
- LocalPlayer(IGameDef *gamedef);
+ LocalPlayer(IGameDef *gamedef
, const char *name
);
virtual ~LocalPlayer();
bool isLocal() const
{
return true;
}
virtual ~LocalPlayer();
bool isLocal() const
{
return true;
}
-
+
ClientActiveObject *parent;
bool isAttached;
ClientActiveObject *parent;
bool isAttached;
@@
-48,7
+48,7
@@
public:
void move(f32 dtime, Environment *env, f32 pos_max_d);
void move(f32 dtime, Environment *env, f32 pos_max_d,
void move(f32 dtime, Environment *env, f32 pos_max_d);
void move(f32 dtime, Environment *env, f32 pos_max_d,
- std::
list
<CollisionInfo> *collision_info);
+ std::
vector
<CollisionInfo> *collision_info);
void applyControl(float dtime);
void applyControl(float dtime);
@@
-62,9
+62,6
@@
public:
unsigned int last_keyPressed;
float camera_impact;
unsigned int last_keyPressed;
float camera_impact;
- int camera_mode;
- v3f eye_offset_first;
- v3f eye_offset_third;
int last_animation;
float last_animation_speed;
int last_animation;
float last_animation_speed;
@@
-72,18
+69,34
@@
public:
std::string hotbar_image;
std::string hotbar_selected_image;
std::string hotbar_image;
std::string hotbar_selected_image;
+ video::SColor light_color;
+
+ GenericCAO* getCAO() const {
+ return m_cao;
+ }
+
+ void setCAO(GenericCAO* toset) {
+ assert( m_cao == NULL ); // Pre-condition
+ m_cao = toset;
+ }
+
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;
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;
+ // 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;
// 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;
bool m_can_jump;
+
+ GenericCAO* m_cao;
};
#endif
};
#endif