diff options
| author | paramat <mat.gregory@virginmedia.com> | 2017-05-09 01:59:02 +0100 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2017-05-09 03:52:28 +0100 |
| commit | da88a186766020762f5c86bc6ba1624e4feaae2c (patch) | |
| tree | f8abbc09c17f951da1e768a963e9b0a68d7d8611 /src/localplayer.cpp | |
| parent | c07c642ab091b7250ecdc5defee1fec26ba73dc4 (diff) | |
| download | minetest-da88a186766020762f5c86bc6ba1624e4feaae2c.tar.gz minetest-da88a186766020762f5c86bc6ba1624e4feaae2c.tar.bz2 minetest-da88a186766020762f5c86bc6ba1624e4feaae2c.zip | |
Revert custom player collision box and step height commits
These caused inability to pass through 2 node high spaces or step up onto slabs
or steps when a new client connected to an older server.
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 20892dee6..b587f7bbb 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -344,8 +344,8 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d, } } - float player_stepheight = (m_cao == 0) ? 0.0f : - ((touching_ground) ? m_cao->getStepheight() : (0.2f * BS)); + // TODO: this shouldn't be hardcoded but transmitted from server + float player_stepheight = (touching_ground) ? (BS * 0.6f) : (BS * 0.2f); #ifdef __ANDROID__ player_stepheight += (0.6f * BS); |