diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-16 14:08:31 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:47 +0200 |
| commit | df8346ef4d70ba7c717c4c7b9c783df876378ca8 (patch) | |
| tree | 9a7e57fcc17942bde7505ff37838d6ab253cedf9 /src/content_nodemeta.cpp | |
| parent | c0f6395cf09f658eb95365c60f67b8a89104cb23 (diff) | |
| download | minetest-df8346ef4d70ba7c717c4c7b9c783df876378ca8.tar.gz minetest-df8346ef4d70ba7c717c4c7b9c783df876378ca8.tar.bz2 minetest-df8346ef4d70ba7c717c4c7b9c783df876378ca8.zip | |
Do not expose CONTENT_* stuff in content_mapnode.h and use a name converter wrapper in old code
Diffstat (limited to 'src/content_nodemeta.cpp')
| -rw-r--r-- | src/content_nodemeta.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp index 17b4a3da4..ab9849668 100644 --- a/src/content_nodemeta.cpp +++ b/src/content_nodemeta.cpp @@ -19,10 +19,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_nodemeta.h" #include "inventory.h" -#include "content_mapnode.h" #include "log.h" #include "utility.h" +#define NODEMETA_SIGN 14 +#define NODEMETA_CHEST 15 +#define NODEMETA_LOCKABLE_CHEST 17 +#define NODEMETA_FURNACE 16 + /* SignNodeMetadata */ @@ -38,7 +42,7 @@ SignNodeMetadata::SignNodeMetadata(IGameDef *gamedef, std::string text): } u16 SignNodeMetadata::typeId() const { - return CONTENT_SIGN_WALL; + return NODEMETA_SIGN; } NodeMetadata* SignNodeMetadata::create(std::istream &is, IGameDef *gamedef) { @@ -79,7 +83,7 @@ ChestNodeMetadata::~ChestNodeMetadata() } u16 ChestNodeMetadata::typeId() const { - return CONTENT_CHEST; + return NODEMETA_CHEST; } NodeMetadata* ChestNodeMetadata::create(std::istream &is, IGameDef *gamedef) { @@ -142,7 +146,7 @@ LockingChestNodeMetadata::~LockingChestNodeMetadata() } u16 LockingChestNodeMetadata::typeId() const { - return CONTENT_LOCKABLE_CHEST; + return NODEMETA_LOCKABLE_CHEST; } NodeMetadata* LockingChestNodeMetadata::create(std::istream &is, IGameDef *gamedef) { @@ -215,7 +219,7 @@ FurnaceNodeMetadata::~FurnaceNodeMetadata() } u16 FurnaceNodeMetadata::typeId() const { - return CONTENT_FURNACE; + return NODEMETA_FURNACE; } NodeMetadata* FurnaceNodeMetadata::clone(IGameDef *gamedef) { |