diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-08-05 11:22:13 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-08-05 11:22:13 +0300 |
| commit | 64a6da3e45838a6f764777728736dfa0f6678778 (patch) | |
| tree | 570cfe68e9036f77ef10f6ca57c3ca489cbb393f /src/environment.cpp | |
| parent | 5f8809e425ba814f102c4387b6bf0cf323bd96c5 (diff) | |
| parent | dd9909a574514f59eb527db682a4e8d85350ead9 (diff) | |
| download | minetest-64a6da3e45838a6f764777728736dfa0f6678778.tar.gz minetest-64a6da3e45838a6f764777728736dfa0f6678778.tar.bz2 minetest-64a6da3e45838a6f764777728736dfa0f6678778.zip | |
merged delta and c55
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index e9b94f3fa..680d209fc 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1511,6 +1511,8 @@ void ClientEnvironment::step(float dtime) /* Get the speed the player is going */ + bool is_climbing = lplayer->is_climbing; + f32 player_speed = 0.001; // just some small value player_speed = lplayer->getSpeed().getLength(); @@ -1568,7 +1570,7 @@ void ClientEnvironment::step(float dtime) v3f lplayerpos = lplayer->getPosition(); // Apply physics - if(free_move == false) + if(free_move == false && is_climbing == false) { // Gravity v3f speed = lplayer->getSpeed(); |