#include "content_inventory.h"
#include "content_sao.h"
#include "player.h"
+#include "log.h"
/*
InventoryItem
{
std::string inventorystring;
std::getline(is, inventorystring, '|');
- return new MapBlockObjectItem(inventorystring);
+ throw SerializationError("MBOItem not supported anymore");
}
else if(name == "CraftItem")
{
}
else
{
- dstream<<"Unknown InventoryItem name=\""<<name<<"\""<<std::endl;
+ infostream<<"Unknown InventoryItem name=\""<<name<<"\""<<std::endl;
throw SerializationError("Unknown InventoryItem name");
}
}
+std::string InventoryItem::getItemString() {
+ // Get item string
+ std::ostringstream os(std::ios_base::binary);
+ serialize(os);
+ return os.str();
+}
+
ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f pos)
{
/*
Create an ItemSAO
*/
- // Get item string
- std::ostringstream os(std::ios_base::binary);
- serialize(os);
// Create object
- ServerActiveObject *obj = new ItemSAO(env, 0, pos, os.str());
+ ServerActiveObject *obj = new ItemSAO(env, 0, pos, getItemString());
return obj;
}
*/
#ifndef SERVER
-video::ITexture * CraftItem::getImage()
+video::ITexture * CraftItem::getImage() const
{
if(g_texturesource == NULL)
return NULL;
{
if(item_craft_is_eatable(m_subname))
{
+ u16 result_count = getCount() - 1; // Eat one at a time
s16 hp_change = item_craft_eat_hp_change(m_subname);
if(player->hp + hp_change > 20)
player->hp = 20;
else
player->hp += hp_change;
- return true;
+
+ if(result_count < 1)
+ return true;
+ else
+ setCount(result_count);
}
return false;
}
-/*
- MapBlockObjectItem DEPRECATED
- TODO: Remove
-*/
-#ifndef SERVER
-video::ITexture * MapBlockObjectItem::getImage()
-{
- if(m_inventorystring.substr(0,3) == "Rat")
- return g_texturesource->getTextureRaw("rat.png");
-
- if(m_inventorystring.substr(0,4) == "Sign")
- return g_texturesource->getTextureRaw("sign.png");
-
- return NULL;
-}
-#endif
-std::string MapBlockObjectItem::getText()
-{
- if(m_inventorystring.substr(0,3) == "Rat")
- return "";
-
- if(m_inventorystring.substr(0,4) == "Sign")
- return "";
-
- return "obj";
-}
-
-MapBlockObject * MapBlockObjectItem::createObject
- (v3f pos, f32 player_yaw, f32 player_pitch)
-{
- std::istringstream is(m_inventorystring);
- std::string name;
- std::getline(is, name, ' ');
-
- if(name == "None")
- {
- return NULL;
- }
- else if(name == "Sign")
- {
- std::string text;
- std::getline(is, text, '|');
- SignObject *obj = new SignObject(NULL, -1, pos);
- obj->setText(text);
- obj->setYaw(-player_yaw);
- return obj;
- }
- else if(name == "Rat")
- {
- RatObject *obj = new RatObject(NULL, -1, pos);
- return obj;
- }
- else if(name == "ItemObj")
- {
- /*
- Now we are an inventory item containing the serialization
- string of an object that contains the serialization
- string of an inventory item. Fuck this.
- */
- //assert(0);
- dstream<<__FUNCTION_NAME<<": WARNING: Ignoring ItemObj "
- <<"because an item-object should never be inside "
- <<"an object-item."<<std::endl;
- return NULL;
- }
- else
- {
- return NULL;
- }
-}
-
/*
Inventory
*/
bool InventoryList::roomForCookedItem(const InventoryItem *item)
{
+ if(!item)
+ return false;
const InventoryItem *cook = item->createCookResult();
if(!cook)
return false;
return a;
}
-void IMoveAction::apply(InventoryContext *c, InventoryManager *mgr)
+static std::string describeC(const struct InventoryContext *c)
{
-#if 1
-
- /*dstream<<"from_inv="<<from_inv<<" to_inv="<<to_inv<<std::endl;
- dstream<<"from_list="<<from_list<<" to_list="<<to_list<<std::endl;
- dstream<<"from_i="<<from_i<<" to_i="<<to_i<<std::endl;*/
+ if(c->current_player == NULL)
+ return "current_player=NULL";
+ else
+ return std::string("current_player=") + c->current_player->getName();
+}
+void IMoveAction::apply(InventoryContext *c, InventoryManager *mgr)
+{
Inventory *inv_from = mgr->getInventory(c, from_inv);
Inventory *inv_to = mgr->getInventory(c, to_inv);
-
- if(!inv_from || !inv_to)
- {
- dstream<<__FUNCTION_NAME<<": Operation not allowed "
- <<"(inventories not found)"<<std::endl;
+
+ if(!inv_from){
+ infostream<<"IMoveAction::apply(): FAIL: source inventory not found: "
+ <<"context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+ <<", to_inv=\""<<to_inv<<"\""<<std::endl;
+ return;
+ }
+ if(!inv_to){
+ infostream<<"IMoveAction::apply(): FAIL: destination inventory not found: "
+ "context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+ <<", to_inv=\""<<to_inv<<"\""<<std::endl;
return;
}
InventoryList *list_from = inv_from->getList(from_list);
InventoryList *list_to = inv_to->getList(to_list);
- /*dstream<<"list_from="<<list_from<<" list_to="<<list_to
- <<std::endl;*/
- /*if(list_from)
- dstream<<" list_from->getItem(from_i)="<<list_from->getItem(from_i)
- <<std::endl;
- if(list_to)
- dstream<<" list_to->getItem(to_i)="<<list_to->getItem(to_i)
- <<std::endl;*/
-
/*
If a list doesn't exist or the source item doesn't exist
*/
- if(!list_from || !list_to)
- {
- dstream<<__FUNCTION_NAME<<": Operation not allowed "
- <<"(a list doesn't exist)"
- <<std::endl;
+ if(!list_from){
+ infostream<<"IMoveAction::apply(): FAIL: source list not found: "
+ <<"context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+ <<", from_list=\""<<from_list<<"\""<<std::endl;
+ return;
+ }
+ if(!list_to){
+ infostream<<"IMoveAction::apply(): FAIL: destination list not found: "
+ <<"context=["<<describeC(c)<<"], to_inv=\""<<to_inv<<"\""
+ <<", to_list=\""<<to_list<<"\""<<std::endl;
return;
}
if(list_from->getItem(from_i) == NULL)
{
- dstream<<__FUNCTION_NAME<<": Operation not allowed "
- <<"(the source item doesn't exist)"
- <<std::endl;
+ infostream<<"IMoveAction::apply(): FAIL: source item not found: "
+ <<"context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+ <<", from_list=\""<<from_list<<"\""
+ <<" from_i="<<from_i<<std::endl;
return;
}
/*
*/
if(inv_from == inv_to && list_from == list_to && from_i == to_i)
{
- dstream<<__FUNCTION_NAME<<": Operation not allowed "
- <<"(source and the destination slots are the same)"<<std::endl;
+ infostream<<"IMoveAction::apply(): FAIL: source and destination slots "
+ <<"are the same: inv=\""<<from_inv<<"\" list=\""<<from_list
+ <<"\" i="<<from_i<<std::endl;
return;
}
mgr->inventoryModified(c, from_inv);
if(from_inv != to_inv)
mgr->inventoryModified(c, to_inv);
-#endif
+
+ infostream<<"IMoveAction::apply(): moved at "
+ <<"["<<describeC(c)<<"]"
+ <<" from inv=\""<<from_inv<<"\""
+ <<" list=\""<<from_list<<"\""
+ <<" i="<<from_i
+ <<" to inv=\""<<to_inv<<"\""
+ <<" list=\""<<to_list<<"\""
+ <<" i="<<to_i
+ <<std::endl;
}
/*