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/game.cpp | |
| parent | f706644a50b9bc62de39f571b044c7f7c55078e4 (diff) | |
| download | minetest-90d793f8f369bf1431d7a915198cd49b98bbe2d7.tar.gz minetest-90d793f8f369bf1431d7a915198cd49b98bbe2d7.tar.bz2 minetest-90d793f8f369bf1431d7a915198cd49b98bbe2d7.zip | |
extended content-type range
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game.cpp b/src/game.cpp index faadd0fe7..7e2ee44fc 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -417,7 +417,7 @@ void getPointedNode(Client *client, v3f player_position, try { n = client->getNode(v3s16(x,y,z)); - if(content_pointable(n.d) == false) + if(content_pointable(n.getContent()) == false) continue; } catch(InvalidPositionException &e) @@ -442,9 +442,9 @@ void getPointedNode(Client *client, v3f player_position, /* Meta-objects */ - if(n.d == CONTENT_TORCH) + if(n.getContent() == CONTENT_TORCH) { - v3s16 dir = unpackDir(n.dir); + v3s16 dir = unpackDir(n.param2); v3f dir_f = v3f(dir.X, dir.Y, dir.Z); dir_f *= BS/2 - BS/6 - BS/20; v3f cpf = npf + dir_f; @@ -489,9 +489,9 @@ void getPointedNode(Client *client, v3f player_position, } } } - else if(n.d == CONTENT_SIGN_WALL) + else if(n.getContent() == CONTENT_SIGN_WALL) { - v3s16 dir = unpackDir(n.dir); + v3s16 dir = unpackDir(n.param2); v3f dir_f = v3f(dir.X, dir.Y, dir.Z); dir_f *= BS/2 - BS/6 - BS/20; v3f cpf = npf + dir_f; @@ -1722,7 +1722,7 @@ void the_game( } // Get digging properties for material and tool - u8 material = n.d; + content_t material = n.getContent(); DiggingProperties prop = getDiggingProperties(material, toolname); |