diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-10-16 18:45:17 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-10-16 18:45:17 +0300 |
| commit | 369177aa8015d75f4cb18c65f435efc1f2a9e05a (patch) | |
| tree | 7c686e54f150a17399d383fa6fd8d57a15ef7653 /src/environment.cpp | |
| parent | 0bf533f7534e84a23b5b9c8a5ca45e67c1cc3f00 (diff) | |
| download | minetest-369177aa8015d75f4cb18c65f435efc1f2a9e05a.tar.gz minetest-369177aa8015d75f4cb18c65f435efc1f2a9e05a.tar.bz2 minetest-369177aa8015d75f4cb18c65f435efc1f2a9e05a.zip | |
Better player damage prevention when falling on unloaded blocks, not involving getting stuck in there.
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index d7bbadd05..1d684129d 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1671,11 +1671,6 @@ void ClientEnvironment::step(float dtime) */ bool is_climbing = lplayer->is_climbing; - /* - Check if the player is frozen (don't apply physics) - */ - bool is_frozen = lplayer->is_frozen; - f32 player_speed = 0.001; // just some small value player_speed = lplayer->getSpeed().getLength(); @@ -1733,7 +1728,7 @@ void ClientEnvironment::step(float dtime) v3f lplayerpos = lplayer->getPosition(); // Apply physics - if(free_move == false && is_climbing == false && is_frozen == false) + if(free_move == false && is_climbing == false) { // Gravity v3f speed = lplayer->getSpeed(); @@ -1767,7 +1762,7 @@ void ClientEnvironment::step(float dtime) while(dtime_downcount > 0.001); //std::cout<<"Looped "<<loopcount<<" times."<<std::endl; - + for(core::list<CollisionInfo>::Iterator i = player_collisions.begin(); i != player_collisions.end(); i++) |