Tune caves

[oweals/minetest.git] / src / nodedef.h

diff --git a/src/nodedef.h b/src/nodedef.h
index 598ad7fb391555eeac7f122189caf479e0fc89b4..a7ffa5a2ee44073969a7785b018f0783b4e43bd8 100644 (file)
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -20,15 +20,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef NODEDEF_HEADER
 #define NODEDEF_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include <string>
 #include <iostream>
-#include <set>
+#include <map>
 #include "mapnode.h"
 #ifndef SERVER
 #include "tile.h"
 #endif
-#include "materials.h" // MaterialProperties
+#include "itemgroup.h"
+#include "sound.h" // SimpleSoundSpec
 class IItemDefManager;
 class ITextureSource;
 class IGameDef;
@@ -37,9 +38,19 @@ enum ContentParamType
 {
        CPT_NONE,
        CPT_LIGHT,
-       CPT_MINERAL,
+};
+
+enum ContentParamType2
+{
+       CPT2_NONE,
+       // Need 8-bit param2
+       CPT2_FULL,
+       // Flowing liquid properties
+       CPT2_FLOWINGLIQUID,
        // Direction for chests and furnaces and such
-       CPT_FACEDIR_SIMPLE
+       CPT2_FACEDIR,
+       // Direction for signs, torches and such
+       CPT2_WALLMOUNTED,
 };
 
 enum LiquidType
@@ -53,7 +64,7 @@ enum NodeBoxType
 {
        NODEBOX_REGULAR, // Regular block; allows buildable_to
        NODEBOX_FIXED, // Static separately defined box
-       NODEBOX_WALLMOUNTED, // Box for wall_mounted nodes; (top, bottom, side)
+       NODEBOX_WALLMOUNTED, // Box for wall mounted nodes; (top, bottom, side)
 };
 
 struct NodeBox
@@ -125,10 +136,9 @@ struct ContentFeatures
        // 0     1     2     3     4     5
        // up    down  right left  back  front 
        TileSpec tiles[6];
-       // Special material/texture
+       // Special tiles
        // - Currently used for flowing liquids
-       video::SMaterial *special_materials[CF_SPECIAL_COUNT];
-       AtlasPointer *special_aps[CF_SPECIAL_COUNT];
+       TileSpec special_tiles[CF_SPECIAL_COUNT];
        u8 solidness; // Used when choosing which face is drawn
        u8 visual_solidness; // When solidness=0, this tells how it looks like
        bool backface_culling;
@@ -139,6 +149,7 @@ struct ContentFeatures
        */
 
        std::string name; // "" = undefined node
+       ItemGroupList groups; // Same as in itemdef
 
        // Visual definition
        enum NodeDrawType drawtype;
@@ -151,6 +162,8 @@ struct ContentFeatures
        video::SColor post_effect_color;
        // Type of MapNode::param1
        ContentParamType param_type;
+       // Type of MapNode::param2
+       ContentParamType2 param_type_2;
        // True for all ground-like things like stone and mud, false for eg. trees
        bool is_ground_content;
        bool light_propagates;
@@ -166,16 +179,6 @@ struct ContentFeatures
        bool climbable;
        // Player can build on these
        bool buildable_to;
-       // If true, param2 is set to direction when placed. Used for torches.
-       // NOTE: the direction format is quite inefficient and should be changed
-       bool wall_mounted;
-       // Inventory item string as which the node appears in inventory when dug.
-       // Mineral overrides this.
-       std::string dug_item;
-       // Extra dug item and its rarity
-       std::string extra_dug_item;
-       // Usual get interval for extra dug item
-       s32 extra_dug_item_rarity;
        // Metadata name of node (eg. "furnace")
        std::string metadata_name;
        // Whether the node is non-liquid, source liquid or flowing liquid
@@ -192,7 +195,16 @@ struct ContentFeatures
        u8 light_source;
        u32 damage_per_second;
        NodeBox selection_box;
-       MaterialProperties material;
+       // Compatibility with old maps
+       // Set to true if paramtype used to be 'facedir_simple'
+       bool legacy_facedir_simple;
+       // Set to true if wall_mounted used to be set to true
+       bool legacy_wallmounted;
+
+       // Sound properties
+       SimpleSoundSpec sound_footstep;
+       SimpleSoundSpec sound_dig;
+       SimpleSoundSpec sound_dug;
 
        /*
                Methods