Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Get movement setting instead of hard coded value
  • Loading branch information
asl97 authored and BlockMen committed Dec 15, 2015
1 parent c26eb87 commit 19f73e4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
17 changes: 17 additions & 0 deletions src/player.cpp
Expand Up @@ -261,6 +261,23 @@ void Player::clearHud()
}
}

RemotePlayer::RemotePlayer(IGameDef *gamedef, const char *name):
Player(gamedef, name),
m_sao(NULL)
{
movement_acceleration_default = g_settings->getFloat("movement_acceleration_default") * BS;
movement_acceleration_air = g_settings->getFloat("movement_acceleration_air") * BS;
movement_acceleration_fast = g_settings->getFloat("movement_acceleration_fast") * BS;
movement_speed_walk = g_settings->getFloat("movement_speed_walk") * BS;
movement_speed_crouch = g_settings->getFloat("movement_speed_crouch") * BS;
movement_speed_fast = g_settings->getFloat("movement_speed_fast") * BS;
movement_speed_climb = g_settings->getFloat("movement_speed_climb") * BS;
movement_speed_jump = g_settings->getFloat("movement_speed_jump") * BS;
movement_liquid_fluidity = g_settings->getFloat("movement_liquid_fluidity") * BS;
movement_liquid_fluidity_smooth = g_settings->getFloat("movement_liquid_fluidity_smooth") * BS;
movement_liquid_sink = g_settings->getFloat("movement_liquid_sink") * BS;
movement_gravity = g_settings->getFloat("movement_gravity") * BS;
}

void RemotePlayer::save(std::string savedir)
{
Expand Down
5 changes: 1 addition & 4 deletions src/player.h
Expand Up @@ -424,10 +424,7 @@ class Player
class RemotePlayer : public Player
{
public:
RemotePlayer(IGameDef *gamedef, const char *name):
Player(gamedef, name),
m_sao(NULL)
{}
RemotePlayer(IGameDef *gamedef, const char *name);
virtual ~RemotePlayer() {}

void save(std::string savedir);
Expand Down

0 comments on commit 19f73e4

Please sign in to comment.