Merge remote-tracking branch 'kahrl/dissector'

[oweals/minetest.git] / src / materials.cpp

diff --git a/src/materials.cpp b/src/materials.cpp
index 50f994523e1e4da1cc92f30caa1b4de258823eea..24f30072435915a6f701d4404b1b703b40415371 100644 (file)
--- a/src/materials.cpp
+++ b/src/materials.cpp
@@ -1,92 +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.65*toughness, 65535./100.*toughness));
-
-       /*g_material_properties[material].setDiggingProperties("MesePick",
-                       DiggingProperties(true, 0.0*toughness, 65535./20.*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);
-
-       g_material_properties[CONTENT_GRASS].setDiggingProperties("",
-                       DiggingProperties(true, 0.4, 0));
-
-       g_material_properties[CONTENT_TORCH].setDiggingProperties("",
-                       DiggingProperties(true, 0.0, 0));
-
-       g_material_properties[CONTENT_TREE].setDiggingProperties("",
-                       DiggingProperties(true, 1.5, 0));
-
-       g_material_properties[CONTENT_LEAVES].setDiggingProperties("",
-                       DiggingProperties(true, 0.35, 0));
-
-       g_material_properties[CONTENT_GRASS_FOOTSTEPS].setDiggingProperties("",
-                       DiggingProperties(true, 0.5, 0));
-
-       setStoneLikeDiggingProperties(CONTENT_MESE, 0.5);
-
-       g_material_properties[CONTENT_MUD].setDiggingProperties("",
-                       DiggingProperties(true, 0.4, 0));
-
-       setStoneLikeDiggingProperties(CONTENT_COALSTONE, 1.5);
-
-       g_material_properties[CONTENT_WOOD].setDiggingProperties("",
-                       DiggingProperties(true, 1.0, 0));
-       
-       g_material_properties[CONTENT_SAND].setDiggingProperties("",
-                       DiggingProperties(true, 0.4, 0));
-       
-       setStoneLikeDiggingProperties(CONTENT_FURNACE, 1.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(u16 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(u16 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);
 }