diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 18:53:54 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 18:55:43 +0200 |
| commit | 4ef9c7675ada82961d83601712a47ebad78b67b5 (patch) | |
| tree | cdfd863219a8dc1031e727740e7d895296c5855d /src/game.cpp | |
| parent | f69123050b62ada635751b7155bb6822b0a97a9b (diff) | |
| parent | dbea511a6f877450cfd5adb86efa55a8f00cc9a1 (diff) | |
| download | minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.xz | |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/game.cpp b/src/game.cpp index 0f858e879..b3069d6f9 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; @@ -538,9 +538,9 @@ void getPointedNode(Client *client, v3f player_position, } } } - else if(n.d == CONTENT_RAIL) + else if(n.getContent() == CONTENT_RAIL) { - v3s16 dir = unpackDir(n.dir); + v3s16 dir = unpackDir(n.param0); v3f dir_f = v3f(dir.X, dir.Y, dir.Z); dir_f *= BS/2 - BS/6 - BS/20; v3f cpf = npf + dir_f; @@ -1038,9 +1038,9 @@ void the_game( //bool screensize_changed = screensize != last_screensize; // Resize hotbar - if(screensize.Y <= 600) + if(screensize.Y <= 800) hotbar_imagesize = 32; - else if(screensize.Y <= 1024) + else if(screensize.Y <= 1280) hotbar_imagesize = 48; else hotbar_imagesize = 64; @@ -1759,7 +1759,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); |