minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2024-11-13 22:10:28 +01:00
Code Issues Releases Wiki Activity

Rename a variable in localplayer.h, resolves a TODO

Browse Source
This commit is contained in:
DS 2022-09-20 10:55:11 +02:00 committed by GitHub
parent 2c3f641e0b
commit 11905a6db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/localplayer.cpp
View File

@ -186,7 +186,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
// Copy parent position if local player is attached
if (getParent()) {
setPosition(m_cao->getPosition());
added_velocity = v3f(0.0f); // ignored
m_added_velocity = v3f(0.0f); // ignored
return;
}
@ -202,12 +202,12 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
setPosition(position);
touching_ground = false;
added_velocity = v3f(0.0f); // ignored
m_added_velocity = v3f(0.0f); // ignored
return;
}
m_speed += added_velocity;
added_velocity = v3f(0.0f);
m_speed += m_added_velocity;
m_added_velocity = v3f(0.0f);
/*
Collision detection
@ -755,7 +755,7 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
if (getParent()) {
setPosition(m_cao->getPosition());
m_sneak_node_exists = false;
added_velocity = v3f(0.0f);
m_added_velocity = v3f(0.0f);
return;
}
@ -771,12 +771,12 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
touching_ground = false;
m_sneak_node_exists = false;
added_velocity = v3f(0.0f);
m_added_velocity = v3f(0.0f);
return;
}
m_speed += added_velocity;
added_velocity = v3f(0.0f);
m_speed += m_added_velocity;
m_added_velocity = v3f(0.0f);
/*
Collision detection

5
src/client/localplayer.h
View File

@ -148,7 +148,7 @@ public:
inline void addVelocity(const v3f &vel)
{
added_velocity += vel;
m_added_velocity += vel;
}
inline Lighting& getLighting() { return m_lighting; }
@ -198,8 +198,7 @@ private:
bool m_autojump = false;
float m_autojump_time = 0.0f;
v3f added_velocity = v3f(0.0f); // cleared on each move()
// TODO: Rename to adhere to convention: added_velocity --> m_added_velocity
v3f m_added_velocity = v3f(0.0f); // in BS-space; cleared on each move()
GenericCAO *m_cao = nullptr;
Client *m_client;