From bfc68d31510bbd40732c19ada51d4683cb050de2 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Fri, 11 Nov 2011 19:33:17 +0200 Subject: Scripting WIP --- src/serverobject.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/serverobject.cpp') diff --git a/src/serverobject.cpp b/src/serverobject.cpp index ce19ea34f..2a007bda5 100644 --- a/src/serverobject.cpp +++ b/src/serverobject.cpp @@ -21,8 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #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), @@ -37,6 +37,11 @@ ServerActiveObject::~ServerActiveObject() { } +void ServerActiveObject::addedToEnvironment(u16 id) +{ + setId(id); +} + ServerActiveObject* ServerActiveObject::create(u8 type, ServerEnvironment *env, u16 id, v3f pos, const std::string &data) @@ -53,7 +58,7 @@ ServerActiveObject* ServerActiveObject::create(u8 type, } Factory f = n->getValue(); - ServerActiveObject *object = (*f)(env, id, pos, data); + ServerActiveObject *object = (*f)(env, pos, data); return object; } -- cgit v1.2.3