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 | 014a3aea3257aadf53e50bcedd4d2da148bafea2 (patch) | |
| tree | e84fdfd731ac14fa17c017cf403b04704b51cee5 /src/serverobject.cpp | |
| parent | 5086bd5664a0b7d60ed8aae757bf0312d9f159e4 (diff) | |
| parent | afa2b8714f2e5dcbc45099c9a9418b25bfcc097f (diff) | |
| download | minetest-014a3aea3257aadf53e50bcedd4d2da148bafea2.tar.gz minetest-014a3aea3257aadf53e50bcedd4d2da148bafea2.tar.bz2 minetest-014a3aea3257aadf53e50bcedd4d2da148bafea2.zip | |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/serverobject.cpp')
| -rw-r--r-- | src/serverobject.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
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), |