From 98ccac59697f12ead0a1ee9e0d71f79fc697293f Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 4 Jul 2011 22:15:22 +0300
Subject: Added tag 0.2.20110704_0 for changeset 65263ec55caf

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 726f5ccfb..2911487cf 100644
--- a/.hgtags
+++ b/.hgtags
@@ -14,3 +14,5 @@ dd08a9b5cb84d55b7576bb3fde3068dd263bc3bc 0.2.20110618_0_dev
 25aa2021937f7a8b36808390983cebbc16ae6965 0.2.20110704_0
 25aa2021937f7a8b36808390983cebbc16ae6965 0.2.20110704_0
 0000000000000000000000000000000000000000 0.2.20110704_0
+0000000000000000000000000000000000000000 0.2.20110704_0
+65263ec55caf526e3f3e0bdc6657ce42daee46bc 0.2.20110704_0
-- 
cgit v1.2.3


From afa2b8714f2e5dcbc45099c9a9418b25bfcc097f Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 16 Jul 2011 17:39:03 +0300
Subject: Attempt to fix a problem with the factory mappings of objects
 residing in different source files than the prototype objects that fill them
 in

---
 src/clientobject.cpp | 2 --
 src/content_cao.cpp  | 2 ++
 src/content_sao.cpp  | 2 ++
 src/serverobject.cpp | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index 787efef29..bec9f46fd 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 ab20f1a95..dc5ac400f 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 fc6f208a0..c41f4ed78 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 8acb35f6d..ce19ea34f 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),
-- 
cgit v1.2.3