diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-07-23 16:55:26 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-23 16:55:26 +0300 |
| commit | 90d793f8f369bf1431d7a915198cd49b98bbe2d7 (patch) | |
| tree | ef04c10888584488cf931e9abcbf962448b24052 /src/player.cpp | |
| parent | f706644a50b9bc62de39f571b044c7f7c55078e4 (diff) | |
| download | minetest-90d793f8f369bf1431d7a915198cd49b98bbe2d7.tar.gz minetest-90d793f8f369bf1431d7a915198cd49b98bbe2d7.tar.bz2 minetest-90d793f8f369bf1431d7a915198cd49b98bbe2d7.zip | |
extended content-type range
Diffstat (limited to 'src/player.cpp')
| -rw-r--r-- | src/player.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/player.cpp b/src/player.cpp index 6bacb088d..d52d6b88f 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -342,13 +342,13 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d, if(in_water) { v3s16 pp = floatToInt(position + v3f(0,BS*0.1,0), BS); - in_water = content_liquid(map.getNode(pp).d); + in_water = content_liquid(map.getNode(pp).getContent()); } // If not in water, the threshold of going in is at lower y else { v3s16 pp = floatToInt(position + v3f(0,BS*0.5,0), BS); - in_water = content_liquid(map.getNode(pp).d); + in_water = content_liquid(map.getNode(pp).getContent()); } } catch(InvalidPositionException &e) @@ -361,7 +361,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d, */ try{ v3s16 pp = floatToInt(position + v3f(0,0,0), BS); - in_water_stable = content_liquid(map.getNode(pp).d); + in_water_stable = content_liquid(map.getNode(pp).getContent()); } catch(InvalidPositionException &e) { @@ -470,7 +470,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d, { try{ // Player collides into walkable nodes - if(content_walkable(map.getNode(v3s16(x,y,z)).d) == false) + if(content_walkable(map.getNode(v3s16(x,y,z)).getContent()) == false) continue; } catch(InvalidPositionException &e) @@ -633,10 +633,10 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d, try{ // The node to be sneaked on has to be walkable - if(content_walkable(map.getNode(p).d) == false) + if(content_walkable(map.getNode(p).getContent()) == false) continue; // And the node above it has to be nonwalkable - if(content_walkable(map.getNode(p+v3s16(0,1,0)).d) == true) + if(content_walkable(map.getNode(p+v3s16(0,1,0)).getContent()) == true) continue; } catch(InvalidPositionException &e) |