/*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+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 "inventorymanager.h"
#include "log.h"
#include "environment.h"
-#include "scriptapi.h"
+#include "scripting_game.h"
#include "serverobject.h"
-#include "main.h" // for g_settings
#include "settings.h"
#include "craftdef.h"
#include "rollback_interface.h"
+#include "strfnd.h"
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
+#define PLAYER_TO_SA(p) p->getEnv()->getScriptIface()
+
/*
InventoryLocation
*/
os<<"detached:"<<name;
break;
default:
- assert(0);
+ FATAL_ERROR("Unhandled inventory location type");
}
}
to_inv.type == InventoryLocation::DETACHED &&
from_inv.name == to_inv.name)
{
- lua_State *L = player->getEnv()->getLua();
- src_can_take_count = scriptapi_detached_inventory_allow_move(
- L, from_inv.name, from_list, from_i,
+ src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowMove(
+ from_inv.name, from_list, from_i,
to_list, to_i, try_take_count, player);
dst_can_put_count = src_can_take_count;
}
// Destination is detached
if(to_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- dst_can_put_count = scriptapi_detached_inventory_allow_put(
- L, to_inv.name, to_list, to_i, src_item, player);
+ dst_can_put_count = PLAYER_TO_SA(player)->detached_inventory_AllowPut(
+ to_inv.name, to_list, to_i, src_item, player);
}
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- src_can_take_count = scriptapi_detached_inventory_allow_take(
- L, from_inv.name, from_list, from_i, src_item, player);
+ src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowTake(
+ from_inv.name, from_list, from_i, src_item, player);
}
}
to_inv.type == InventoryLocation::NODEMETA &&
from_inv.p == to_inv.p)
{
- lua_State *L = player->getEnv()->getLua();
- src_can_take_count = scriptapi_nodemeta_inventory_allow_move(
- L, from_inv.p, from_list, from_i,
+ src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowMove(
+ from_inv.p, from_list, from_i,
to_list, to_i, try_take_count, player);
dst_can_put_count = src_can_take_count;
}
// Destination is nodemeta
if(to_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- dst_can_put_count = scriptapi_nodemeta_inventory_allow_put(
- L, to_inv.p, to_list, to_i, src_item, player);
+ dst_can_put_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowPut(
+ to_inv.p, to_list, to_i, src_item, player);
}
// Source is nodemeta
if(from_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- src_can_take_count = scriptapi_nodemeta_inventory_allow_take(
- L, from_inv.p, from_list, from_i, src_item, player);
+ src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowTake(
+ from_inv.p, from_list, from_i, src_item, player);
}
}
if(dst_can_put_count == -1){
list_to->deleteItem(to_i);
list_to->addItem(to_i, to_stack_was);
+ list_from->deleteItem(from_i);
+ list_from->addItem(from_i, from_stack_was);
list_from->takeItem(from_i, count);
}
*/
if(!ignore_rollback && gamedef->rollback())
{
- IRollbackReportSink *rollback = gamedef->rollback();
+ IRollbackManager *rollback = gamedef->rollback();
// If source is not infinite, record item take
if(src_can_take_count != -1){
loc = os.str();
}
action.setModifyInventoryStack(loc, from_list, from_i, false,
- src_item.getItemString());
+ src_item);
rollback->reportAction(action);
}
// If destination is not infinite, record item put
loc = os.str();
}
action.setModifyInventoryStack(loc, to_list, to_i, true,
- src_item.getItemString());
+ src_item);
rollback->reportAction(action);
}
}
to_inv.type == InventoryLocation::DETACHED &&
from_inv.name == to_inv.name)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_detached_inventory_on_move(
- L, from_inv.name, from_list, from_i,
+ PLAYER_TO_SA(player)->detached_inventory_OnMove(
+ from_inv.name, from_list, from_i,
to_list, to_i, count, player);
}
else
// Destination is detached
if(to_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_detached_inventory_on_put(
- L, to_inv.name, to_list, to_i, src_item, player);
+ PLAYER_TO_SA(player)->detached_inventory_OnPut(
+ to_inv.name, to_list, to_i, src_item, player);
}
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_detached_inventory_on_take(
- L, from_inv.name, from_list, from_i, src_item, player);
+ PLAYER_TO_SA(player)->detached_inventory_OnTake(
+ from_inv.name, from_list, from_i, src_item, player);
}
}
to_inv.type == InventoryLocation::NODEMETA &&
from_inv.p == to_inv.p)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_nodemeta_inventory_on_move(
- L, from_inv.p, from_list, from_i,
+ PLAYER_TO_SA(player)->nodemeta_inventory_OnMove(
+ from_inv.p, from_list, from_i,
to_list, to_i, count, player);
}
else{
// Destination is nodemeta
if(to_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_nodemeta_inventory_on_put(
- L, to_inv.p, to_list, to_i, src_item, player);
+ PLAYER_TO_SA(player)->nodemeta_inventory_OnPut(
+ to_inv.p, to_list, to_i, src_item, player);
}
// Source is nodemeta
else if(from_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_nodemeta_inventory_on_take(
- L, from_inv.p, from_list, from_i, src_item, player);
+ PLAYER_TO_SA(player)->nodemeta_inventory_OnTake(
+ from_inv.p, from_list, from_i, src_item, player);
}
}
- mgr->setInventoryModified(from_inv);
+ mgr->setInventoryModified(from_inv, false);
if(inv_from != inv_to)
- mgr->setInventoryModified(to_inv);
+ mgr->setInventoryModified(to_inv, false);
}
void IMoveAction::clientApply(InventoryManager *mgr, IGameDef *gamedef)
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = take_count;
- src_can_take_count = scriptapi_detached_inventory_allow_take(
- L, from_inv.name, from_list, from_i, src_item, player);
+ src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowTake(
+ from_inv.name, from_list, from_i, src_item, player);
}
// Source is nodemeta
if(from_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = take_count;
- src_can_take_count = scriptapi_nodemeta_inventory_allow_take(
- L, from_inv.p, from_list, from_i, src_item, player);
+ src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowTake(
+ from_inv.p, from_list, from_i, src_item, player);
}
if(src_can_take_count != -1 && src_can_take_count < take_count)
// Drop the item
ItemStack item1 = list_from->getItem(from_i);
item1.count = take_count;
- if(scriptapi_item_on_drop(player->getEnv()->getLua(), item1, player,
+ if(PLAYER_TO_SA(player)->item_OnDrop(item1, player,
player->getBasePosition() + v3f(0,1,0)))
{
actually_dropped_count = take_count - item1.count;
if(item2.count != actually_dropped_count)
errorstream<<"Could not take dropped count of items"<<std::endl;
- mgr->setInventoryModified(from_inv);
+ mgr->setInventoryModified(from_inv, false);
}
}
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_detached_inventory_on_take(
- L, from_inv.name, from_list, from_i, src_item, player);
+ PLAYER_TO_SA(player)->detached_inventory_OnTake(
+ from_inv.name, from_list, from_i, src_item, player);
}
// Source is nodemeta
if(from_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_nodemeta_inventory_on_take(
- L, from_inv.p, from_list, from_i, src_item, player);
+ PLAYER_TO_SA(player)->nodemeta_inventory_OnTake(
+ from_inv.p, from_list, from_i, src_item, player);
}
/*
*/
if(!ignore_src_rollback && gamedef->rollback())
{
- IRollbackReportSink *rollback = gamedef->rollback();
+ IRollbackManager *rollback = gamedef->rollback();
// If source is not infinite, record item take
if(src_can_take_count != -1){
loc = os.str();
}
action.setModifyInventoryStack(loc, from_list, from_i,
- false, src_item.getItemString());
+ false, src_item);
rollback->reportAction(action);
}
}
}
ItemStack crafted;
+ ItemStack craftresultitem;
int count_remaining = count;
- bool found = getCraftingResult(inv_craft, crafted, false, gamedef);
+ getCraftingResult(inv_craft, crafted, false, gamedef);
+ PLAYER_TO_SA(player)->item_CraftPredict(crafted, player, list_craft, craft_inv);
+ bool found = !crafted.empty();
while(found && list_craftresult->itemFits(0, crafted))
{
+ InventoryList saved_craft_list = *list_craft;
+
// Decrement input and add crafting output
getCraftingResult(inv_craft, crafted, true, gamedef);
+ PLAYER_TO_SA(player)->item_OnCraft(crafted, player, &saved_craft_list, craft_inv);
list_craftresult->addItem(0, crafted);
mgr->setInventoryModified(craft_inv);
// Get next crafting result
found = getCraftingResult(inv_craft, crafted, false, gamedef);
+ PLAYER_TO_SA(player)->item_CraftPredict(crafted, player, list_craft, craft_inv);
+ found = !crafted.empty();
}
infostream<<"ICraftAction::apply(): crafted "