summaryrefslogtreecommitdiff
path: root/src/voxel.cpp
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-30 18:53:54 +0200
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-30 18:55:43 +0200
commit4ef9c7675ada82961d83601712a47ebad78b67b5 (patch)
treecdfd863219a8dc1031e727740e7d895296c5855d /src/voxel.cpp
parentf69123050b62ada635751b7155bb6822b0a97a9b (diff)
parentdbea511a6f877450cfd5adb86efa55a8f00cc9a1 (diff)
downloadminetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.gz
minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.bz2
minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.zip
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/voxel.cpp')
-rw-r--r--src/voxel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/voxel.cpp b/src/voxel.cpp
index 5938f9016..616a197e3 100644
--- a/src/voxel.cpp
+++ b/src/voxel.cpp
@@ -93,7 +93,7 @@ void VoxelManipulator::print(std::ostream &o, VoxelPrintMode mode)
else
{
c = 'X';
- u8 m = m_data[m_area.index(x,y,z)].d;
+ content_t m = m_data[m_area.index(x,y,z)].getContent();
u8 pr = m_data[m_area.index(x,y,z)].param2;
if(mode == VOXELPRINT_MATERIAL)
{