summaryrefslogtreecommitdiff
path: root/src/mapnode_contentfeatures.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-11-13 15:45:38 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-11-29 19:13:41 +0200
commitf97d4355beb79370d3bc69ea6baabb33ed90a8cd (patch)
tree16bbbe9449ac443a8ecf96e329aceeb7de0fe809 /src/mapnode_contentfeatures.h
parente19d1ea95aa125c82828a26a9af46c0a23710e70 (diff)
downloadminetest-f97d4355beb79370d3bc69ea6baabb33ed90a8cd.tar.gz
minetest-f97d4355beb79370d3bc69ea6baabb33ed90a8cd.tar.bz2
minetest-f97d4355beb79370d3bc69ea6baabb33ed90a8cd.zip
New kind of tool speed and wear calculation thingy
Diffstat (limited to 'src/mapnode_contentfeatures.h')
-rw-r--r--src/mapnode_contentfeatures.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mapnode_contentfeatures.h b/src/mapnode_contentfeatures.h
index 835d95c33..68342c1f8 100644
--- a/src/mapnode_contentfeatures.h
+++ b/src/mapnode_contentfeatures.h
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef SERVER
#include "tile.h"
#endif
-#include "materials.h" // DiggingProperties
+#include "materials.h" // MaterialProperties
/*
Content feature list
@@ -175,12 +175,11 @@ struct ContentFeatures
// Amount of light the node emits
u8 light_source;
- // Digging properties for different tools
- DiggingPropertiesList digging_properties;
-
u32 damage_per_second;
NodeBox selection_box;
+
+ MaterialProperties material;
// NOTE: Move relevant properties to here from elsewhere
@@ -216,9 +215,9 @@ struct ContentFeatures
liquid_alternative_source = CONTENT_IGNORE;
liquid_viscosity = 0;
light_source = 0;
- digging_properties.clear();
damage_per_second = 0;
selection_box = NodeBox();
+ material = MaterialProperties();
}
ContentFeatures()