BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

remove content_* things from map.cpp

Browse Source
This commit is contained in:
darkrose 2011-09-23 18:04:48 +10:00
parent 79cb754358
commit 8b875d71d1
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/content_nodemeta.h
View File

@ -77,8 +77,8 @@ public:
virtual bool nodeRemovalDisabled(); virtual bool nodeRemovalDisabled();
virtual std::string getInventoryDrawSpecString(); virtual std::string getInventoryDrawSpecString();
std::string getOwner(){ return m_text; } virtual std::string getOwner(){ return m_text; }
void setOwner(std::string t){ m_text = t; } virtual void setOwner(std::string t){ m_text = t; }
private: private:
Inventory *m_inventory; Inventory *m_inventory;

15
src/map.cpp
View File

@ -28,8 +28,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "porting.h" #include "porting.h"
#include "mapgen.h" #include "mapgen.h"
#include "nodemetadata.h" #include "nodemetadata.h"
#include "content_nodemeta.h"
#include "content_mapnode.h"
/* /*
SQLite format specification: SQLite format specification:
@ -1016,20 +1014,9 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
if(meta_proto) if(meta_proto)
{ {
NodeMetadata *meta = meta_proto->clone(); NodeMetadata *meta = meta_proto->clone();
/* lockable chest, insert the owner's name */ meta->setOwner(player_name);
if (meta->typeId() == CONTENT_LOCKABLE_CHEST)
{
LockingChestNodeMetadata *lcm = (LockingChestNodeMetadata*)meta;
lcm->setOwner(player_name);
}
setNodeMetadata(p, meta); 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, If node is under sunlight and doesn't let sunlight through,

3
src/nodemetadata.h
View File

@ -65,6 +65,9 @@ public:
// Used to make custom inventory menus. // Used to make custom inventory menus.
// See format in guiInventoryMenu.cpp. // See format in guiInventoryMenu.cpp.
virtual std::string getInventoryDrawSpecString(){return "";} 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: protected:
static void registerType(u16 id, Factory f); static void registerType(u16 id, Factory f);