summaryrefslogtreecommitdiff
path: root/src/content_mapnode.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-11-25 15:38:18 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-11-29 19:13:51 +0200
commit6a8f9135de448d805457e0b1f561c711d760565e (patch)
tree784ba14cc7cc6f759d76480b154b685a413d5207 /src/content_mapnode.cpp
parent704d8a62bf4c52c5ac0d9a85b0b902ea833a7e90 (diff)
downloadminetest-6a8f9135de448d805457e0b1f561c711d760565e.tar.gz
minetest-6a8f9135de448d805457e0b1f561c711d760565e.tar.bz2
minetest-6a8f9135de448d805457e0b1f561c711d760565e.zip
Store metadata as metadata name in node definition
Diffstat (limited to 'src/content_mapnode.cpp')
-rw-r--r--src/content_mapnode.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index cddc552d4..eda252dc1 100644
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes.h"
#include "mapnode.h"
-#include "content_nodemeta.h"
#include "nodedef.h"
#include "utility.h"
#include "nameidmapping.h"
@@ -802,8 +801,7 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
f.wall_mounted = true;
f.air_equivalent = true;
f.dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- if(f.initial_metadata == NULL)
- f.initial_metadata = new SignNodeMetadata(NULL, "Some sign");
+ f.metadata_name = "sign";
setConstantMaterialProperties(f.material, 0.5);
f.selection_box.type = NODEBOX_WALLMOUNTED;
f.furnace_burntime = 10;
@@ -820,8 +818,7 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
f.setInventoryTexture("chest_top.png");
//f.setInventoryTextureCube("chest_top.png", "chest_side.png", "chest_side.png");
f.dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- if(f.initial_metadata == NULL)
- f.initial_metadata = new ChestNodeMetadata(NULL);
+ f.metadata_name = "chest";
setWoodLikeMaterialProperties(f.material, 1.0);
f.furnace_burntime = 30;
nodemgr->set(i, f);
@@ -837,8 +834,7 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
f.setInventoryTexture("chest_lock.png");
//f.setInventoryTextureCube("chest_top.png", "chest_side.png", "chest_side.png");
f.dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
- if(f.initial_metadata == NULL)
- f.initial_metadata = new LockingChestNodeMetadata(NULL);
+ f.metadata_name = "locked_chest";
setWoodLikeMaterialProperties(f.material, 1.0);
f.furnace_burntime = 30;
nodemgr->set(i, f);
@@ -852,8 +848,7 @@ void content_mapnode_init(IWritableNodeDefManager *nodemgr)
f.setInventoryTexture("furnace_front.png");
//f.dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f.dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE)+" 6";
- if(f.initial_metadata == NULL)
- f.initial_metadata = new FurnaceNodeMetadata(NULL);
+ f.metadata_name = "furnace";
setStoneLikeMaterialProperties(f.material, 3.0);
nodemgr->set(i, f);