Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/upstream'

This commit is contained in:
Nils Dagsson Moskopp 2011-07-16 16:52:45 +02:00
parent 4d20f1283f afa2b8714f
commit 8bfa56648d
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hgtags
View File

@ -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

2
src/clientobject.cpp
View File

@ -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)
{

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 "environment.h"
core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
/*
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 "environment.h"
core::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
/*
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 "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),