summaryrefslogtreecommitdiff
path: root/src/localplayer.h
diff options
context:
space:
mode:
authorparamat <mat.gregory@virginmedia.com>2017-04-05 12:18:22 +0100
committerparamat <mat.gregory@virginmedia.com>2017-04-17 10:13:05 +0100
commitf6da7b3fda5bbb793c7795a228ea6f2602b93fbe (patch)
treeca2bd50fdf29414cbee58576786170928676b8a5 /src/localplayer.h
parent907be0ab918a99c30c37c4abfe3e11722691f3bc (diff)
downloadminetest-f6da7b3fda5bbb793c7795a228ea6f2602b93fbe.tar.gz
minetest-f6da7b3fda5bbb793c7795a228ea6f2602b93fbe.tar.bz2
minetest-f6da7b3fda5bbb793c7795a228ea6f2602b93fbe.zip
Sneak: Add option for old move code
Temporary option for the old move code for specific old sneak behaviour. Enabled by setting the added 'new move' physics override to false. By default 'new move' is true.
Diffstat (limited to 'src/localplayer.h')
-rw-r--r--src/localplayer.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/localplayer.h b/src/localplayer.h
index ae987b893..01e859bf0 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -58,12 +58,17 @@ public:
float physics_override_gravity;
bool physics_override_sneak;
bool physics_override_sneak_glitch;
+ // Temporary option for old move code
+ bool physics_override_new_move;
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);
+ // Temporary option for old move code
+ void old_move(f32 dtime, Environment *env, f32 pos_max_d,
+ std::vector<CollisionInfo> *collision_info);
void applyControl(float dtime);
@@ -137,6 +142,9 @@ private:
v3f m_position;
v3s16 m_sneak_node;
+ // Stores the max player uplift by m_sneak_node
+ // To support temporary option for old move code
+ f32 m_sneak_node_bb_ymax;
// Stores the top bounding box of m_sneak_node
aabb3f m_sneak_node_bb_top;
// Whether the player is allowed to sneak