diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-16 16:52:45 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-16 16:52:45 +0200 |
| commit | 8bfa56648d42d1ad264b9754ea00d336c8ee471c (patch) | |
| tree | 5149f2c4850a40a473a31b8847b7538e632890b0 | |
| parent | 4d20f1283f883dff0475dbda65090689823959e6 (diff) | |
| parent | afa2b8714f2e5dcbc45099c9a9418b25bfcc097f (diff) | |
| download | minetest-8bfa56648d42d1ad264b9754ea00d336c8ee471c.tar.gz minetest-8bfa56648d42d1ad264b9754ea00d336c8ee471c.tar.bz2 minetest-8bfa56648d42d1ad264b9754ea00d336c8ee471c.zip | |
Merge remote-tracking branch 'origin/upstream'
| -rw-r--r-- | .hgtags | 2 | ||||
| -rw-r--r-- | src/clientobject.cpp | 2 | ||||
| -rw-r--r-- | src/content_cao.cpp | 2 | ||||
| -rw-r--r-- | src/content_sao.cpp | 2 | ||||
| -rw-r--r-- | src/serverobject.cpp | 2 |
5 files changed, 6 insertions, 4 deletions
@@ -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 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), |