Attempt to fix a problem with the factory mappings of objects residing in different source files than the prototype objects that fill them in
parent
98ccac5969
commit
afa2b8714f
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -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
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -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),
|
||||||
|
|
Loading…
Reference in New Issue