aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-16 16:52:45 +0200
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-16 16:52:45 +0200
commit014a3aea3257aadf53e50bcedd4d2da148bafea2 (patch)
treee84fdfd731ac14fa17c017cf403b04704b51cee5 /src
parent5086bd5664a0b7d60ed8aae757bf0312d9f159e4 (diff)
parentafa2b8714f2e5dcbc45099c9a9418b25bfcc097f (diff)
downloadminetest-014a3aea3257aadf53e50bcedd4d2da148bafea2.tar.gz
minetest-014a3aea3257aadf53e50bcedd4d2da148bafea2.tar.bz2
minetest-014a3aea3257aadf53e50bcedd4d2da148bafea2.zip
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src')
-rw-r--r--src/clientobject.cpp2
-rw-r--r--src/content_cao.cpp2
-rw-r--r--src/content_sao.cpp2
-rw-r--r--src/serverobject.cpp2
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),