Formspec: make bgcolor element less confusing and allow setting fullscreen color...

[minetest.git] / src / serverobject.cpp

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 48d487ab03653b5d7f456775ff2535d6812489c6..1ed33f66b88c0e7d0cd2760b6b42bb1bbe5e9198 100644 (file)
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -1,83 +1,83 @@
 /*
-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
+#include "log.h"
 
-ServerActiveObject::ServerActiveObject(ServerEnvironment *env, u16 id, v3f pos):
-       ActiveObject(id),
-       m_known_by_count(0),
-       m_removed(false),
+ServerActiveObject::ServerActiveObject(ServerEnvironment *env, v3f pos):
+       ActiveObject(0),
        m_env(env),
        m_base_position(pos)
 {
 }
 
-ServerActiveObject::~ServerActiveObject()
+ServerActiveObject* ServerActiveObject::create(ActiveObjectType type,
+               ServerEnvironment *env, u16 id, v3f pos,
+               const std::string &data)
 {
-}
-
-/*
-       TestSAO
-*/
+       // Find factory function
+       std::map<u16, Factory>::iterator n;
+       n = m_types.find(type);
+       if(n == m_types.end()) {
+               // These are 0.3 entity types, return without error.
+               if (ACTIVEOBJECT_TYPE_ITEM <= type && type <= ACTIVEOBJECT_TYPE_MOBV2) {
+                       return NULL;
+               }
+
+               // If factory is not found, just return.
+               warningstream<<"ServerActiveObject: No factory for type="
+                               <<type<<std::endl;
+               return NULL;
+       }
 
-TestSAO::TestSAO(ServerEnvironment *env, u16 id, v3f pos):
-       ServerActiveObject(env, id, pos),
-       m_timer1(0),
-       m_age(0)
-{
+       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_base_position.Y += dtime * BS * 2;
-       if(m_base_position.Y > 8*BS)
-               m_base_position.Y = 2*BS;
-
-       m_timer1 -= dtime;
-       if(m_timer1 < 0.0)
-       {
-               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);
+       m_types[type] = f;
+}
 
-               ActiveObjectMessage aom(getId(), false, data);
-               messages.push_back(aom);
-       }
+float ServerActiveObject::getMinimumSavedMovement()
+{
+       return 2.0*BS;
 }
 
+ItemStack ServerActiveObject::getWieldedItem(ItemStack *selected, ItemStack *hand) const
+{
+       *selected = ItemStack();
+       if (hand)
+               *hand = ItemStack();
 
+       return ItemStack();
+}
 
+bool ServerActiveObject::setWieldedItem(const ItemStack &item)
+{
+       return false;
+}