Merge pull request #13 from Bahamada/upstream_merge

Upstream merge

1 files changed, 7 insertions, 106 deletions

diff --git a/src/materials.cpp b/src/materials.cpp
index a8a9a94a8..e3a24b9e3 100644
--- a/src/materials.cpp
+++ b/src/materials.cpp
@@ -1,119 +1,20 @@
 #include "materials.h"
+#include "mapnode.h"
 
-#define MATERIAL_PROPERTIES_COUNT 256
+// NOTE: DEPRECATED
 
-// These correspond to the CONTENT_* constants
-MaterialProperties g_material_properties[MATERIAL_PROPERTIES_COUNT];
-
-bool g_material_properties_initialized = false;
-
-void setStoneLikeDiggingProperties(u8 material, float toughness)
-{
-	g_material_properties[material].setDiggingProperties("",
-			DiggingProperties(true, 15.0*toughness, 0));
-	
-	g_material_properties[material].setDiggingProperties("WPick",
-			DiggingProperties(true, 1.3*toughness, 65535./30.*toughness));
-	g_material_properties[material].setDiggingProperties("STPick",
-			DiggingProperties(true, 0.75*toughness, 65535./100.*toughness));
-	g_material_properties[material].setDiggingProperties("SteelPick",
-			DiggingProperties(true, 0.50*toughness, 65535./333.*toughness));
-
-	/*g_material_properties[material].setDiggingProperties("MesePick",
-			DiggingProperties(true, 0.0*toughness, 65535./20.*toughness));*/
-}
-
-void setDirtLikeDiggingProperties(u8 material, float toughness)
-{
-	g_material_properties[material].setDiggingProperties("",
-			DiggingProperties(true, 0.75*toughness, 0));
-	
-	g_material_properties[material].setDiggingProperties("WShovel",
-			DiggingProperties(true, 0.4*toughness, 65535./50.*toughness));
-	g_material_properties[material].setDiggingProperties("STShovel",
-			DiggingProperties(true, 0.2*toughness, 65535./150.*toughness));
-	g_material_properties[material].setDiggingProperties("SteelShovel",
-			DiggingProperties(true, 0.15*toughness, 65535./400.*toughness));
-}
-
-void setWoodLikeDiggingProperties(u8 material, float toughness)
-{
-	g_material_properties[material].setDiggingProperties("",
-			DiggingProperties(true, 3.0*toughness, 0));
-	
-	g_material_properties[material].setDiggingProperties("WAxe",
-			DiggingProperties(true, 1.5*toughness, 65535./30.*toughness));
-	g_material_properties[material].setDiggingProperties("STAxe",
-			DiggingProperties(true, 0.75*toughness, 65535./100.*toughness));
-	g_material_properties[material].setDiggingProperties("SteelAxe",
-			DiggingProperties(true, 0.5*toughness, 65535./333.*toughness));
-}
-
-void initializeMaterialProperties()
-{
-	/*
-		Now, the g_material_properties array is already initialized
-		by the constructors to such that no digging is possible.
-
-		Add some digging properties to them.
-	*/
-
-	setStoneLikeDiggingProperties(CONTENT_STONE, 1.0);
-	setStoneLikeDiggingProperties(CONTENT_SANDSTONE, 1.0);
-	setStoneLikeDiggingProperties(CONTENT_BRICK, 3.0);
-	setStoneLikeDiggingProperties(CONTENT_MESE, 0.5);
-	setStoneLikeDiggingProperties(CONTENT_COALSTONE, 1.5);
-	setStoneLikeDiggingProperties(CONTENT_FURNACE, 3.0);
-	setStoneLikeDiggingProperties(CONTENT_COBBLE, 1.0);
-	setStoneLikeDiggingProperties(CONTENT_STEEL, 5.0);
-
-	setDirtLikeDiggingProperties(CONTENT_MUD, 1.0);
-	setDirtLikeDiggingProperties(CONTENT_GRASS, 1.0);
-	setDirtLikeDiggingProperties(CONTENT_GRASS_FOOTSTEPS, 1.0);
-	setDirtLikeDiggingProperties(CONTENT_SAND, 1.0);
-	setDirtLikeDiggingProperties(CONTENT_CLAY, 1.0);
-	
-	setWoodLikeDiggingProperties(CONTENT_TREE, 1.0);
-	setWoodLikeDiggingProperties(CONTENT_LEAVES, 0.15);
-	setWoodLikeDiggingProperties(CONTENT_CACTUS, 0.75);
-	setWoodLikeDiggingProperties(CONTENT_PAPYRUS, 0.25);
-	setWoodLikeDiggingProperties(CONTENT_GLASS, 0.15);
-	setWoodLikeDiggingProperties(CONTENT_FENCE, 0.75);
-	setDirtLikeDiggingProperties(CONTENT_RAIL, 0.75);
-	setWoodLikeDiggingProperties(CONTENT_WOOD, 0.75);
-	setWoodLikeDiggingProperties(CONTENT_BOOKSHELF, 0.75);
-	setWoodLikeDiggingProperties(CONTENT_CHEST, 1.0);
-
-	g_material_properties[CONTENT_SIGN_WALL].setDiggingProperties("",
-			DiggingProperties(true, 0.5, 0));
-	g_material_properties[CONTENT_TORCH].setDiggingProperties("",
-			DiggingProperties(true, 0.0, 0));
-	
-	/*
-		Add MesePick to everything
-	*/
-	for(u16 i=0; i<MATERIAL_PROPERTIES_COUNT; i++)
-	{
-		g_material_properties[i].setDiggingProperties("MesePick",
-				DiggingProperties(true, 0.0, 65535./1337));
-	}
-
-	g_material_properties_initialized = true;
-}
-
-MaterialProperties * getMaterialProperties(u8 material)
+DiggingPropertiesList * getDiggingPropertiesList(u8 content)
 {
-	assert(g_material_properties_initialized);
-	return &g_material_properties[material];
+	return &content_features(content).digging_properties;
 }
 
-DiggingProperties getDiggingProperties(u8 material, const std::string &tool)
+DiggingProperties getDiggingProperties(u8 content, const std::string &tool)
 {
-	MaterialProperties *mprop = getMaterialProperties(material);
+	DiggingPropertiesList *mprop = getDiggingPropertiesList(content);
 	if(mprop == NULL)
 		// Not diggable
 		return DiggingProperties();
 	
-	return mprop->getDiggingProperties(tool);
+	return mprop->get(tool);
 }