diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-12-01 01:58:31 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-12-01 01:58:31 +0200 |
| commit | 8b8ef8acc0cc0b59e231d55e7857f629fee27e66 (patch) | |
| tree | 6b59dffa4cc0949bd732ddc632dba408d7d91c27 /src | |
| parent | 74c6836f2fd5c80e901bae604973b700b06727d8 (diff) | |
| download | minetest-8b8ef8acc0cc0b59e231d55e7857f629fee27e66.tar.gz minetest-8b8ef8acc0cc0b59e231d55e7857f629fee27e66.tar.bz2 minetest-8b8ef8acc0cc0b59e231d55e7857f629fee27e66.zip | |
Move NodeMetadata prototype containers to content_nodemeta.cpp to fix them not being filled correctly on some systems and compilers
Diffstat (limited to 'src')
| -rw-r--r-- | src/content_nodemeta.cpp | 3 | ||||
| -rw-r--r-- | src/nodemetadata.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp index 064194186..8666051a4 100644 --- a/src/content_nodemeta.cpp +++ b/src/content_nodemeta.cpp @@ -32,6 +32,9 @@ class Inventory; #define NODEMETA_FURNACE 16 #define NODEMETA_LOCKABLE_CHEST 17 +core::map<u16, NodeMetadata::Factory> NodeMetadata::m_types; +core::map<std::string, NodeMetadata::Factory2> NodeMetadata::m_names; + class SignNodeMetadata : public NodeMetadata { public: diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp index 7abf82426..410b4e2ea 100644 --- a/src/nodemetadata.cpp +++ b/src/nodemetadata.cpp @@ -30,9 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc., NodeMetadata */ -core::map<u16, NodeMetadata::Factory> NodeMetadata::m_types; -core::map<std::string, NodeMetadata::Factory2> NodeMetadata::m_names; - NodeMetadata::NodeMetadata(IGameDef *gamedef): m_gamedef(gamedef) { |