Fix getVisibleBrightness() to return sunlight visibility correctly even if not much...

[minetest.git] / src / serverobject.cpp

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 3645f76669684c104c70aacc0bc35237df8f0321..4d7f1924359bdee0889942620b8378dd5550ddcd 100644 (file)
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -19,12 +19,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "serverobject.h"
 #include <fstream>
-#include "environment.h"
+#include "inventory.h"
 
-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,81 +37,60 @@ ServerActiveObject::~ServerActiveObject()
 {
 }
 
-/*
-       TestSAO
-*/
-
-TestSAO::TestSAO(ServerEnvironment *env, u16 id, v3f pos):
-       ServerActiveObject(env, id, pos),
-       m_timer1(0),
-       m_age(0)
-{
-}
-
-void TestSAO::step(float dtime, Queue<ActiveObjectMessage> &messages)
+ServerActiveObject* ServerActiveObject::create(u8 type,
+               ServerEnvironment *env, u16 id, v3f pos,
+               const std::string &data)
 {
-       m_age += dtime;
-       if(m_age > 10)
+       // Find factory function
+       core::map<u16, Factory>::Node *n;
+       n = m_types.find(type);
+       if(n == NULL)
        {
-               m_removed = true;
-               return;
+               // If factory is not found, just return.
+               dstream<<"WARNING: ServerActiveObject: No factory for type="
+                               <<type<<std::endl;
+               return NULL;
        }
 
-       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);
-
-               ActiveObjectMessage aom(getId(), false, data);
-               messages.push_back(aom);
-       }
+       Factory f = n->getValue();
+       ServerActiveObject *object = (*f)(env, pos, data);
+       return object;
 }
 
-
-/*
-       ItemSAO
-*/
-
-ItemSAO::ItemSAO(ServerEnvironment *env, u16 id, v3f pos,
-               const std::string inventorystring):
-       ServerActiveObject(env, id, pos),
-       m_inventorystring(inventorystring)
+void ServerActiveObject::registerType(u16 type, Factory f)
 {
-       dstream<<"Server: ItemSAO created with inventorystring=\""
-                       <<m_inventorystring<<"\""<<std::endl;
+       core::map<u16, Factory>::Node *n;
+       n = m_types.find(type);
+       if(n)
+               return;
+       m_types.insert(type, f);
 }
 
-void ItemSAO::step(float dtime, Queue<ActiveObjectMessage> &messages)
+ItemStack ServerActiveObject::getWieldedItem() const
 {
+       const Inventory *inv = getInventory();
+       if(inv)
+       {
+               const InventoryList *list = inv->getList(getWieldList());
+               if(list)
+                       return list->getItem(getWieldIndex());
+       }
+       return ItemStack();
 }
 
-std::string ItemSAO::getClientInitializationData()
+bool ServerActiveObject::setWieldedItem(const ItemStack &item)
 {
-       dstream<<__FUNCTION_NAME<<std::endl;
-       std::string data;
-       data += itos(m_base_position.X);
-       data += ",";
-       data += itos(m_base_position.Y);
-       data += ",";
-       data += itos(m_base_position.Z);
-       data += ":";
-       data += m_inventorystring;
-       return data;
+       Inventory *inv = getInventory();
+       if(inv)
+       {
+               InventoryList *list = inv->getList(getWieldList());
+               if (list)
+               {
+                       list->changeItem(getWieldIndex(), item);
+                       setInventoryModified();
+                       return true;
+               }
+       }
+       return false;
 }
 
-