X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fserverobject.cpp;h=81307bc34f23a69d5f51f8e80bcc96d8b6fb6c9d;hb=58e6d25e033c76dc91aaac18fdeda92ac23fe0e1;hp=48d487ab03653b5d7f456775ff2535d6812489c6;hpb=e4f7f97e6c79cda72dec7cd6fea5b85328b75894;p=oweals%2Fminetest.git

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 48d487ab0..81307bc34 100644
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -1,30 +1,34 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "serverobject.h"
 #include <fstream>
-#include "environment.h"
+#include "inventory.h"
+#include "constants.h" // BS
 
-ServerActiveObject::ServerActiveObject(ServerEnvironment *env, u16 id, v3f pos):
-	ActiveObject(id),
+ServerActiveObject::ServerActiveObject(ServerEnvironment *env, v3f pos):
+	ActiveObject(0),
 	m_known_by_count(0),
 	m_removed(false),
+	m_pending_deactivation(false),
+	m_static_exists(false),
+	m_static_block(1337,1337,1337),
 	m_env(env),
 	m_base_position(pos)
 {
@@ -34,50 +38,65 @@ ServerActiveObject::~ServerActiveObject()
 {
 }
 
-/*
-	TestSAO
-*/
-
-TestSAO::TestSAO(ServerEnvironment *env, u16 id, v3f pos):
-	ServerActiveObject(env, id, pos),
-	m_timer1(0),
-	m_age(0)
+ServerActiveObject* ServerActiveObject::create(u8 type,
+		ServerEnvironment *env, u16 id, v3f pos,
+		const std::string &data)
 {
+	// Find factory function
+	std::map<u16, Factory>::iterator n;
+	n = m_types.find(type);
+	if(n == m_types.end())
+	{
+		// If factory is not found, just return.
+		dstream<<"WARNING: ServerActiveObject: No factory for type="
+				<<type<<std::endl;
+		return NULL;
+	}
+
+	Factory f = n->second;
+	ServerActiveObject *object = (*f)(env, pos, data);
+	return object;
 }
 
-void TestSAO::step(float dtime, Queue<ActiveObjectMessage> &messages)
+void ServerActiveObject::registerType(u16 type, Factory f)
 {
-	m_age += dtime;
-	if(m_age > 10)
-	{
-		m_removed = true;
+	std::map<u16, Factory>::iterator n;
+	n = m_types.find(type);
+	if(n != m_types.end())
 		return;
-	}
+	m_types[type] = f;
+}
 
-	m_base_position.Y += dtime * BS * 2;
-	if(m_base_position.Y > 8*BS)
-		m_base_position.Y = 2*BS;
+float ServerActiveObject::getMinimumSavedMovement()
+{
+	return 2.0*BS;
+}
 
-	m_timer1 -= dtime;
-	if(m_timer1 < 0.0)
+ItemStack ServerActiveObject::getWieldedItem() const
+{
+	const Inventory *inv = getInventory();
+	if(inv)
 	{
-		m_timer1 += 0.125;
-		//dstream<<"TestSAO: id="<<getId()<<" sending data"<<std::endl;
-
-		std::string data;
-
-		data += itos(0); // 0 = position
-		data += " ";
-		data += itos(m_base_position.X);
-		data += " ";
-		data += itos(m_base_position.Y);
-		data += " ";
-		data += itos(m_base_position.Z);
-
-		ActiveObjectMessage aom(getId(), false, data);
-		messages.push_back(aom);
+		const InventoryList *list = inv->getList(getWieldList());
+		if(list && (getWieldIndex() < (s32)list->getSize())) 
+			return list->getItem(getWieldIndex());
 	}
+	return ItemStack();
 }
 
-
+bool ServerActiveObject::setWieldedItem(const ItemStack &item)
+{
+	Inventory *inv = getInventory();
+	if(inv)
+	{
+		InventoryList *list = inv->getList(getWieldList());
+		if (list)
+		{
+			list->changeItem(getWieldIndex(), item);
+			setInventoryModified();
+			return true;
+		}
+	}
+	return false;
+}