Rename a variable in localplayer.h, resolves a TODO

EleutherAI · Sep 20, 2022 · 11905a6 · 11905a6
1 parent 2c3f641
commit 11905a6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp
@@ -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

diff --git a/src/client/localplayer.h b/src/client/localplayer.h
@@ -148,7 +148,7 @@ class LocalPlayer : public Player
 
  inline void addVelocity(const v3f &vel)
  {
- added_velocity += vel;
+ m_added_velocity += vel;
  }
 
  inline Lighting& getLighting() { return m_lighting; }
@@ -198,8 +198,7 @@ class LocalPlayer : public Player
  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;