From: Perttu Ahola Date: Wed, 30 Nov 2011 23:58:31 +0000 (+0200) Subject: Move NodeMetadata prototype containers to content_nodemeta.cpp to fix them not being... X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=8b8ef8acc0cc0b59e231d55e7857f629fee27e66;p=zefram%2Fminetest%2Fminetest_engine.git Move NodeMetadata prototype containers to content_nodemeta.cpp to fix them not being filled correctly on some systems and compilers --- diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp index 06419418..8666051a 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 NodeMetadata::m_types; +core::map NodeMetadata::m_names; + class SignNodeMetadata : public NodeMetadata { public: diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp index 7abf8242..410b4e2e 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 NodeMetadata::m_types; -core::map NodeMetadata::m_names; - NodeMetadata::NodeMetadata(IGameDef *gamedef): m_gamedef(gamedef) {