minetest-stuffs/dragonfire-client-waspsaliva
minetest-stuffs/dragonfire-client-waspsaliva
1
0
Fork 0
Code Issues 2 Pull Requests Releases 2 Wiki Activity

Fix legit_speed

Browse Source
This commit is contained in:
Elias Fleckenstein 2021-03-26 12:57:30 +01:00
parent 22f73e9f27
commit 63f7c96ec2
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/localplayer.cpp
View File

@ -172,7 +172,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
{
if (m_cao && m_cao->m_waiting_for_reattach > 0)
m_cao->m_waiting_for_reattach -= dtime;
// Node at feet position, update each ClientEnvironment::step()
if (!collision_info || collision_info->empty())
m_standing_node = floatToInt(m_position, BS);
@ -461,8 +461,6 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
m_speed.Y += jumpspeed;
}
setSpeed(m_speed);
if (! m_freecam)
m_legit_speed = m_speed;
m_can_jump = false;
}

20
src/client/localplayer.h
View File

@ -140,8 +140,8 @@ public:
v3f getPosition() const { return m_position; }
v3f getLegitPosition() const { return m_legit_position; }
v3f getLegitSpeed() const { return m_legit_speed; }
v3f getLegitSpeed() const { return m_freecam ? m_legit_speed : m_speed; }
inline void setLegitPosition(const v3f &position)
{
@ -151,18 +151,18 @@ public:
setPosition(position);
}
inline void freecamEnable()
inline void freecamEnable()
{
m_freecam = true;
}
inline void freecamDisable()
inline void freecamDisable()
{
m_freecam = false;
setPosition(m_legit_position);
setSpeed(m_legit_speed);
}
// Non-transformed eye offset getters
// For accurate positions, use the Camera functions
v3f getEyePosition() const { return m_position + getEyeOffset(); }
@ -184,13 +184,13 @@ public:
{
added_velocity += vel;
}
void tryReattach(int id);
bool isWaitingForReattach() const;
bool canWalkOn(const ContentFeatures &f);
private:
void accelerate(const v3f &target_speed, const f32 max_increase_H,
const f32 max_increase_V, const bool use_pitch);