Skip to content
Permalink
Browse files

Cleanup LocalPlayer::applyControl

* Use Environment interface instead of ClientEnvironemnt
* Don't create slippery variable and then re-affect it
* itemgroup_get return a int, properly test != 0 to be clearer
  • Loading branch information...
nerzhul committed Aug 13, 2017
1 parent 2ea26e6 commit d65d6160d83a47311ceb33738d2a5e249e76e4c0
Showing with 4 additions and 5 deletions.
  1. +3 −4 src/localplayer.cpp
  2. +1 −1 src/localplayer.h
@@ -444,7 +444,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d)
move(dtime, env, pos_max_d, NULL);
}

void LocalPlayer::applyControl(float dtime, ClientEnvironment *env)
void LocalPlayer::applyControl(float dtime, Environment *env)
{
// Clear stuff
swimming_vertical = false;
@@ -660,11 +660,10 @@ void LocalPlayer::applyControl(float dtime, ClientEnvironment *env)
else
incH = incV = movement_acceleration_default * BS * dtime;

INodeDefManager *nodemgr = env->getGameDef()->ndef();
const INodeDefManager *nodemgr = env->getGameDef()->ndef();
Map *map = &env->getMap();
bool slippery = false;
const ContentFeatures &f = nodemgr->get(map->getNodeNoEx(getStandingNodePos()));
slippery = itemgroup_get(f.groups, "slippery");
bool slippery = (itemgroup_get(f.groups, "slippery") != 0);
// Accelerate to target speed with maximum increment
accelerateHorizontal(speedH * physics_override_speed,
incH * physics_override_speed, slippery);
@@ -79,7 +79,7 @@ class LocalPlayer : public Player
void old_move(f32 dtime, Environment *env, f32 pos_max_d,
std::vector<CollisionInfo> *collision_info);

void applyControl(float dtime, ClientEnvironment *env);
void applyControl(float dtime, Environment *env);

v3s16 getStandingNodePos();
v3s16 getFootstepNodePos();

0 comments on commit d65d616

Please sign in to comment.
You can’t perform that action at this time.