/*
Minetest
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+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 Lesser General Public License as published by
#include <fstream>
#include "inventory.h"
#include "constants.h" // BS
+#include "log.h"
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)
{
}
-ServerActiveObject::~ServerActiveObject()
-{
-}
-
-ServerActiveObject* ServerActiveObject::create(u8 type,
+ServerActiveObject* ServerActiveObject::create(ActiveObjectType type,
ServerEnvironment *env, u16 id, v3f pos,
const std::string &data)
{
// Find factory function
- core::map<u16, Factory>::Node *n;
+ std::map<u16, Factory>::iterator n;
n = m_types.find(type);
- if(n == NULL)
- {
+ 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.
- dstream<<"WARNING: ServerActiveObject: No factory for type="
+ warningstream<<"ServerActiveObject: No factory for type="
<<type<<std::endl;
return NULL;
}
- Factory f = n->getValue();
+ Factory f = n->second;
ServerActiveObject *object = (*f)(env, pos, data);
return object;
}
void ServerActiveObject::registerType(u16 type, Factory f)
{
- core::map<u16, Factory>::Node *n;
+ std::map<u16, Factory>::iterator n;
n = m_types.find(type);
- if(n)
+ if(n != m_types.end())
return;
- m_types.insert(type, f);
+ m_types[type] = f;
}
float ServerActiveObject::getMinimumSavedMovement()
return 2.0*BS;
}
-ItemStack ServerActiveObject::getWieldedItem() const
+ItemStack ServerActiveObject::getWieldedItem(ItemStack *selected, ItemStack *hand) const
{
- const Inventory *inv = getInventory();
- if(inv)
- {
- const InventoryList *list = inv->getList(getWieldList());
- if(list)
- return list->getItem(getWieldIndex());
- }
+ *selected = ItemStack();
+ if (hand)
+ *hand = ItemStack();
+
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;
}
-