remove content_* things from map.cpp

diff --git a/src/content_nodemeta.h b/src/content_nodemeta.h
index af3374124b79f39784804bcaae7e250dbaf6e95d..e20334312fd8a12d1a1a1cc5b8efe1c183f0d1ff 100644 (file)
--- a/src/content_nodemeta.h
+++ b/src/content_nodemeta.h
@@ -77,8 +77,8 @@ public:
        virtual bool nodeRemovalDisabled();
        virtual std::string getInventoryDrawSpecString();
 
-       std::string getOwner(){ return m_text; }
-       void setOwner(std::string t){ m_text = t; }
+       virtual std::string getOwner(){ return m_text; }
+       virtual void setOwner(std::string t){ m_text = t; }
 
 private:
        Inventory *m_inventory;

diff --git a/src/map.cpp b/src/map.cpp
index a8e7235cfdde19d994f86d39b5f4aefc2cb96e6c..32675f08d96523c5b2f640a2912ffcb0279a79ca 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -28,8 +28,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "mapgen.h"
 #include "nodemetadata.h"
-#include "content_nodemeta.h"
-#include "content_mapnode.h"
 
 /*
        SQLite format specification:
@@ -1016,20 +1014,9 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
        if(meta_proto)
        {
                NodeMetadata *meta = meta_proto->clone();
-               /* lockable chest, insert the owner's name */
-               if (meta->typeId() == CONTENT_LOCKABLE_CHEST)
-               {
-                       LockingChestNodeMetadata *lcm = (LockingChestNodeMetadata*)meta;
-                       lcm->setOwner(player_name);
-               }
+               meta->setOwner(player_name);
                setNodeMetadata(p, meta);
        }
-       else if (n.getContent() == CONTENT_LOCKABLE_CHEST)
-       {
-               LockingChestNodeMetadata *lcm =  new LockingChestNodeMetadata();
-               lcm->setOwner(player_name);
-               setNodeMetadata(p, (NodeMetadata*)lcm);
-       }
 
        /*
                If node is under sunlight and doesn't let sunlight through,

diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index de682f9b61561374a92ef80769e33f47ab335295..d81ade96cf434e8dbc5fc406679f44d1f535a199 100644 (file)
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -65,6 +65,9 @@ public:
        // Used to make custom inventory menus.
        // See format in guiInventoryMenu.cpp.
        virtual std::string getInventoryDrawSpecString(){return "";}
+       // primarily used for locking chests, but others can play too
+       virtual std::string getOwner(){ return std::string(""); }
+       virtual void setOwner(std::string t){  }
 
 protected:
        static void registerType(u16 id, Factory f);