mirror of
				https://github.com/luanti-org/luanti.git
				synced 2025-11-04 09:15:29 +01:00 
			
		
		
		
	Attempt to fix a problem with the factory mappings of objects residing in different source files than the prototype objects that fill them in
This commit is contained in:
		@@ -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)
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
*/
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
*/
 | 
			
		||||
 
 | 
			
		||||
@@ -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),
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user