Make dungeon masters not shoot the walls with no reason

[oweals/minetest.git] / src / serverobject.cpp

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 48d487ab03653b5d7f456775ff2535d6812489c6..ce19ea34f10a85d7b46aa1a8038e0dde24b7d777 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),
        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,49 +37,33 @@ 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);
+       Factory f = n->getValue();
+       ServerActiveObject *object = (*f)(env, id, pos, data);
+       return object;
+}
 
-               ActiveObjectMessage aom(getId(), false, data);
-               messages.push_back(aom);
-       }
+void ServerActiveObject::registerType(u16 type, Factory f)
+{
+       core::map<u16, Factory>::Node *n;
+       n = m_types.find(type);
+       if(n)
+               return;
+       m_types.insert(type, f);
 }