Merge remote-tracking branch 'origin/upstream'

diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index 787efef294c988dae5c5e6f758e0fd0a1daf9f0a..bec9f46fdd0c8a6cb5942c92cbe2fb55fbf5e36b 100644 (file)
--- a/src/clientobject.cpp
+++ b/src/clientobject.cpp
@@ -26,8 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        ClientActiveObject
 */
 
-core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
-
 ClientActiveObject::ClientActiveObject(u16 id):
        ActiveObject(id)
 {

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index ab20f1a9588fa8a399afc20556f1a9253c060a69..dc5ac400f5da3f05f400291ade4911ab7f220866 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "tile.h"
 #include "environment.h"
 
+core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
+
 /*
        TestCAO
 */

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index fc6f208a0b527e0e3700e47e19f3677cc7a57644..c41f4ed784297e0aaf08efb5ac6dc1f0bba0a07c 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "collision.h"
 #include "environment.h"
 
+core::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
+
 /*
        TestSAO
 */

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 8acb35f6db84fefd601d03e8f4496dbb050f5c2c..ce19ea34f10a85d7b46aa1a8038e0dde24b7d777 100644 (file)
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -21,8 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <fstream>
 #include "inventory.h"
 
-core::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
-
 ServerActiveObject::ServerActiveObject(ServerEnvironment *env, u16 id, v3f pos):
        ActiveObject(id),
        m_known_by_count(0),