From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 16 Jul 2011 14:39:03 +0000 (+0300)
Subject: Attempt to fix a problem with the factory mappings of objects residing in different... 
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=afa2b8714f2e5dcbc45099c9a9418b25bfcc097f;p=zefram%2Fminetest%2Fminetest_engine.git

Attempt to fix a problem with the factory mappings of objects residing in different source files than the prototype objects that fill them in
---

diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index 787efef2..bec9f46f 100644
--- 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 ab20f1a9..dc5ac400 100644
--- 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 fc6f208a..c41f4ed7 100644
--- 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 8acb35f6..ce19ea34 100644
--- 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),