projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Node highlighting.
[oweals/minetest.git]
/
src
/
inventorymanager.cpp
diff --git
a/src/inventorymanager.cpp
b/src/inventorymanager.cpp
index 1a7f56f315534d1791e691997b1eabb20ac95aff..1c511e9cbe69f7659e70e8a7a1d5e172285af73b 100644
(file)
--- a/
src/inventorymanager.cpp
+++ b/
src/inventorymanager.cpp
@@
-1,6
+1,6
@@
/*
/*
-Minetest
-c55
-Copyright (C) 2010-201
1
celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-201
3
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
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
@@
-20,7
+20,7
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include "inventorymanager.h"
#include "log.h"
#include "environment.h"
#include "inventorymanager.h"
#include "log.h"
#include "environment.h"
-#include "script
api
.h"
+#include "script
ing_game
.h"
#include "serverobject.h"
#include "main.h" // for g_settings
#include "settings.h"
#include "serverobject.h"
#include "main.h" // for g_settings
#include "settings.h"
@@
-29,6
+29,8
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
+#define PLAYER_TO_SA(p) p->getEnv()->getScriptIface()
+
/*
InventoryLocation
*/
/*
InventoryLocation
*/
@@
-226,9
+228,8
@@
void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
to_inv.type == InventoryLocation::DETACHED &&
from_inv.name == to_inv.name)
{
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;
}
to_list, to_i, try_take_count, player);
dst_can_put_count = src_can_take_count;
}
@@
-237,20
+238,18
@@
void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Destination is detached
if(to_inv.type == InventoryLocation::DETACHED)
{
// 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;
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- dst_can_put_count =
scriptapi_detached_inventory_allow_p
ut(
-
L,
to_inv.name, to_list, to_i, src_item, player);
+ dst_can_put_count =
PLAYER_TO_SA(player)->detached_inventory_AllowP
ut(
+ to_inv.name, to_list, to_i, src_item, player);
}
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
}
// 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;
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- src_can_take_count =
scriptapi_detached_inventory_allow_t
ake(
-
L,
from_inv.name, from_list, from_i, src_item, player);
+ src_can_take_count =
PLAYER_TO_SA(player)->detached_inventory_AllowT
ake(
+ from_inv.name, from_list, from_i, src_item, player);
}
}
}
}
@@
-262,9
+261,8
@@
void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
to_inv.type == InventoryLocation::NODEMETA &&
from_inv.p == to_inv.p)
{
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;
}
to_list, to_i, try_take_count, player);
dst_can_put_count = src_can_take_count;
}
@@
-273,20
+271,18
@@
void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Destination is nodemeta
if(to_inv.type == InventoryLocation::NODEMETA)
{
// 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;
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- dst_can_put_count =
scriptapi_nodemeta_inventory_allow_p
ut(
-
L,
to_inv.p, to_list, to_i, src_item, player);
+ dst_can_put_count =
PLAYER_TO_SA(player)->nodemeta_inventory_AllowP
ut(
+ to_inv.p, to_list, to_i, src_item, player);
}
// Source is nodemeta
if(from_inv.type == InventoryLocation::NODEMETA)
{
}
// 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;
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- src_can_take_count =
scriptapi_nodemeta_inventory_allow_t
ake(
-
L,
from_inv.p, from_list, from_i, src_item, player);
+ src_can_take_count =
PLAYER_TO_SA(player)->nodemeta_inventory_AllowT
ake(
+ from_inv.p, from_list, from_i, src_item, player);
}
}
}
}
@@
-351,6
+347,8
@@
void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
if(dst_can_put_count == -1){
list_to->deleteItem(to_i);
list_to->addItem(to_i, to_stack_was);
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);
}
list_from->takeItem(from_i, count);
}
@@
-410,9
+408,8
@@
void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
to_inv.type == InventoryLocation::DETACHED &&
from_inv.name == to_inv.name)
{
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
to_list, to_i, count, player);
}
else
@@
-420,16
+417,14
@@
void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Destination is detached
if(to_inv.type == InventoryLocation::DETACHED)
{
// 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)
{
}
// 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);
}
}
}
}
@@
-440,25
+435,22
@@
void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
to_inv.type == InventoryLocation::NODEMETA &&
from_inv.p == to_inv.p)
{
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)
{
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)
{
}
// 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);
}
}
}
}
@@
-561,21
+553,19
@@
void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
// 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;
ItemStack src_item = list_from->getItem(from_i);
src_item.count = take_count;
- src_can_take_count =
scriptapi_detached_inventory_allow_t
ake(
-
L,
from_inv.name, from_list, from_i, src_item, player);
+ src_can_take_count =
PLAYER_TO_SA(player)->detached_inventory_AllowT
ake(
+ from_inv.name, from_list, from_i, src_item, player);
}
// Source is nodemeta
if(from_inv.type == InventoryLocation::NODEMETA)
{
}
// 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;
ItemStack src_item = list_from->getItem(from_i);
src_item.count = take_count;
- src_can_take_count =
scriptapi_nodemeta_inventory_allow_t
ake(
-
L,
from_inv.p, from_list, from_i, src_item, player);
+ src_can_take_count =
PLAYER_TO_SA(player)->nodemeta_inventory_AllowT
ake(
+ from_inv.p, from_list, from_i, src_item, player);
}
if(src_can_take_count != -1 && src_can_take_count < take_count)
}
if(src_can_take_count != -1 && src_can_take_count < take_count)
@@
-588,7
+578,7
@@
void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Drop the item
ItemStack item1 = list_from->getItem(from_i);
item1.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;
player->getBasePosition() + v3f(0,1,0)))
{
actually_dropped_count = take_count - item1.count;
@@
-625,17
+615,15
@@
void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
// 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)
{
}
// 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);
}
/*
}
/*
@@
-736,13
+724,19
@@
void ICraftAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGam
}
ItemStack crafted;
}
ItemStack crafted;
+ ItemStack craftresultitem;
int count_remaining = count;
bool found = getCraftingResult(inv_craft, crafted, false, gamedef);
int count_remaining = count;
bool found = getCraftingResult(inv_craft, crafted, false, gamedef);
+ PLAYER_TO_SA(player)->item_CraftPredict(crafted, player, list_craft, craft_inv);
+ found = !crafted.empty();
while(found && list_craftresult->itemFits(0, crafted))
{
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);
// 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);
list_craftresult->addItem(0, crafted);
mgr->setInventoryModified(craft_inv);
@@
-759,6
+753,8
@@
void ICraftAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGam
// Get next crafting result
found = getCraftingResult(inv_craft, crafted, false, gamedef);
// 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 "
}
infostream<<"ICraftAction::apply(): crafted "