moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-12-23 16:08:51 -05:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/upstream'

Browse Source
This commit is contained in:
Nils Dagsson Moskopp 2011-07-16 16:52:45 +02:00
commit 014a3aea32
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clientobject.cpp
View File

@ -26,8 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
ClientActiveObject ClientActiveObject
*/ */
core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
ClientActiveObject::ClientActiveObject(u16 id): ClientActiveObject::ClientActiveObject(u16 id):
ActiveObject(id) ActiveObject(id)
{ {

2
src/content_cao.cpp
View File

@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "tile.h" #include "tile.h"
#include "environment.h" #include "environment.h"
core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
/* /*
TestCAO TestCAO
*/ */

2
src/content_sao.cpp
View File

@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "collision.h" #include "collision.h"
#include "environment.h" #include "environment.h"
core::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
/* /*
TestSAO TestSAO
*/ */

2
src/serverobject.cpp
View File

@ -21,8 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <fstream> #include <fstream>
#include "inventory.h" #include "inventory.h"
core::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
ServerActiveObject::ServerActiveObject(ServerEnvironment *env, u16 id, v3f pos): ServerActiveObject::ServerActiveObject(ServerEnvironment *env, u16 id, v3f pos):
ActiveObject(id), ActiveObject(id),
m_known_by_count(0), m_known_by_count(0),