mirror of https://github.com/minetest/minetest.git
C++11 cleanup inventorymanager (#6077)
* C++11 cleanup inventorymanager
This commit is contained in:
Vincent Glize
Loïc Blot
parent
6e5588c8e1
commit
c772e0e18c
|
|
@ -3526,7 +3526,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
|
|||
|
||||
// Possibly send inventory action to server
|
||||
if (move_amount > 0) {
|
||||
// Send IACTION_MOVE
|
||||
// Send IAction::Move
|
||||
|
||||
assert(m_selected_item && m_selected_item->isValid());
|
||||
assert(s.isValid());
|
||||
|
|
@ -3563,7 +3563,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
|
|||
m_selected_content_guess = ItemStack(); // Clear
|
||||
}
|
||||
|
||||
infostream << "Handing IACTION_MOVE to manager" << std::endl;
|
||||
infostream << "Handing IAction::Move to manager" << std::endl;
|
||||
IMoveAction *a = new IMoveAction();
|
||||
a->count = move_amount;
|
||||
a->from_inv = m_selected_item->inventoryloc;
|
||||
|
|
@ -3599,7 +3599,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
|
|||
ItemStack stack_from = list_from->getItem(s.i);
|
||||
assert(shift_move_amount <= stack_from.count);
|
||||
if (m_client->getProtoVersion() >= 25) {
|
||||
infostream << "Handing IACTION_MOVE to manager" << std::endl;
|
||||
infostream << "Handing IAction::Move to manager" << std::endl;
|
||||
IMoveAction *a = new IMoveAction();
|
||||
a->count = shift_move_amount;
|
||||
a->from_inv = s.inventoryloc;
|
||||
|
|
@ -3617,7 +3617,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
|
|||
&& shift_move_amount > 0; slot_to++) {
|
||||
list_to->itemFits(slot_to, stack_from, &leftover);
|
||||
if (leftover.count < stack_from.count) {
|
||||
infostream << "Handing IACTION_MOVE to manager" << std::endl;
|
||||
infostream << "Handing IAction::Move to manager" << std::endl;
|
||||
IMoveAction *a = new IMoveAction();
|
||||
a->count = MYMIN(shift_move_amount,
|
||||
(u32) (stack_from.count - leftover.count));
|
||||
|
|
@ -3637,7 +3637,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
|
|||
} else if (drop_amount > 0) {
|
||||
m_selected_content_guess = ItemStack(); // Clear
|
||||
|
||||
// Send IACTION_DROP
|
||||
// Send IAction::Drop
|
||||
|
||||
assert(m_selected_item && m_selected_item->isValid());
|
||||
assert(inv_selected);
|
||||
|
|
@ -3650,7 +3650,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
|
|||
assert(drop_amount > 0 && drop_amount <= m_selected_amount);
|
||||
m_selected_amount -= drop_amount;
|
||||
|
||||
infostream << "Handing IACTION_DROP to manager" << std::endl;
|
||||
infostream << "Handing IAction::Drop to manager" << std::endl;
|
||||
IDropAction *a = new IDropAction();
|
||||
a->count = drop_amount;
|
||||
a->from_inv = m_selected_item->inventoryloc;
|
||||
|
|
@ -3660,12 +3660,12 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
|
|||
} else if (craft_amount > 0) {
|
||||
m_selected_content_guess = ItemStack(); // Clear
|
||||
|
||||
// Send IACTION_CRAFT
|
||||
// Send IAction::Craft
|
||||
|
||||
assert(s.isValid());
|
||||
assert(inv_s);
|
||||
|
||||
infostream << "Handing IACTION_CRAFT to manager" << std::endl;
|
||||
infostream << "Handing IAction::Craft to manager" << std::endl;
|
||||
ICraftAction *a = new ICraftAction();
|
||||
a->count = craft_amount;
|
||||
a->craft_inv = s.inventoryloc;
|
||||
|
|
|
|||
|
|
@ -68,21 +68,14 @@ void InventoryLocation::deSerialize(std::istream &is)
|
|||
{
|
||||
std::string tname;
|
||||
std::getline(is, tname, ':');
|
||||
if(tname == "undefined")
|
||||
{
|
||||
if (tname == "undefined") {
|
||||
type = InventoryLocation::UNDEFINED;
|
||||
}
|
||||
else if(tname == "current_player")
|
||||
{
|
||||
} else if (tname == "current_player") {
|
||||
type = InventoryLocation::CURRENT_PLAYER;
|
||||
}
|
||||
else if(tname == "player")
|
||||
{
|
||||
} else if (tname == "player") {
|
||||
type = InventoryLocation::PLAYER;
|
||||
std::getline(is, name, '\n');
|
||||
}
|
||||
else if(tname == "nodemeta")
|
||||
{
|
||||
} else if (tname == "nodemeta") {
|
||||
type = InventoryLocation::NODEMETA;
|
||||
std::string pos;
|
||||
std::getline(is, pos, '\n');
|
||||
|
|
@ -90,14 +83,10 @@ void InventoryLocation::deSerialize(std::istream &is)
|
|||
p.X = stoi(fn.next(","));
|
||||
p.Y = stoi(fn.next(","));
|
||||
p.Z = stoi(fn.next(","));
|
||||
}
|
||||
else if(tname == "detached")
|
||||
{
|
||||
} else if (tname == "detached") {
|
||||
type = InventoryLocation::DETACHED;
|
||||
std::getline(is, name, '\n');
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
infostream<<"Unknown InventoryLocation type=\""<<tname<<"\""<<std::endl;
|
||||
throw SerializationError("Unknown InventoryLocation type");
|
||||
}
|
||||
|
|
@ -118,7 +107,7 @@ InventoryAction * InventoryAction::deSerialize(std::istream &is)
|
|||
std::string type;
|
||||
std::getline(is, type, ' ');
|
||||
|
||||
InventoryAction *a = NULL;
|
||||
InventoryAction *a = nullptr;
|
||||
|
||||
if (type == "Move") {
|
||||
a = new IMoveAction(is, false);
|
||||
|
|
@ -137,12 +126,10 @@ InventoryAction * InventoryAction::deSerialize(std::istream &is)
|
|||
IMoveAction
|
||||
*/
|
||||
|
||||
IMoveAction::IMoveAction(std::istream &is, bool somewhere)
|
||||
IMoveAction::IMoveAction(std::istream &is, bool somewhere) :
|
||||
move_somewhere(somewhere)
|
||||
{
|
||||
std::string ts;
|
||||
move_somewhere = somewhere;
|
||||
caused_by_move_somewhere = false;
|
||||
move_count = 0;
|
||||
|
||||
std::getline(is, ts, ' ');
|
||||
count = stoi(ts);
|
||||
|
|
@ -276,26 +263,21 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
// Move occurs in the same detached inventory
|
||||
if (from_inv.type == InventoryLocation::DETACHED &&
|
||||
to_inv.type == InventoryLocation::DETACHED &&
|
||||
from_inv.name == to_inv.name)
|
||||
{
|
||||
from_inv.name == to_inv.name) {
|
||||
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;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Destination is detached
|
||||
if(to_inv.type == InventoryLocation::DETACHED)
|
||||
{
|
||||
if (to_inv.type == InventoryLocation::DETACHED) {
|
||||
ItemStack src_item = list_from->getItem(from_i);
|
||||
src_item.count = try_take_count;
|
||||
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)
|
||||
{
|
||||
if (from_inv.type == InventoryLocation::DETACHED) {
|
||||
ItemStack src_item = list_from->getItem(from_i);
|
||||
src_item.count = try_take_count;
|
||||
src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowTake(
|
||||
|
|
@ -309,26 +291,21 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
// Move occurs in the same nodemeta inventory
|
||||
if (from_inv.type == InventoryLocation::NODEMETA &&
|
||||
to_inv.type == InventoryLocation::NODEMETA &&
|
||||
from_inv.p == to_inv.p)
|
||||
{
|
||||
from_inv.p == to_inv.p) {
|
||||
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;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Destination is nodemeta
|
||||
if(to_inv.type == InventoryLocation::NODEMETA)
|
||||
{
|
||||
if (to_inv.type == InventoryLocation::NODEMETA) {
|
||||
ItemStack src_item = list_from->getItem(from_i);
|
||||
src_item.count = try_take_count;
|
||||
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)
|
||||
{
|
||||
if (from_inv.type == InventoryLocation::NODEMETA) {
|
||||
ItemStack src_item = list_from->getItem(from_i);
|
||||
src_item.count = try_take_count;
|
||||
src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowTake(
|
||||
|
|
@ -349,8 +326,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
count = list_from->getItem(from_i).count;
|
||||
|
||||
/* If no items will be moved, don't go further */
|
||||
if(count == 0)
|
||||
{
|
||||
if (count == 0) {
|
||||
infostream<<"IMoveAction::apply(): move was completely disallowed:"
|
||||
<<" count="<<old_count
|
||||
<<" from inv=\""<<from_inv.dump()<<"\""
|
||||
|
|
@ -426,15 +402,13 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
// If we are inside the move somewhere loop, we don't need to report
|
||||
// anything if nothing happened (perhaps we don't need to report
|
||||
// anything for caused_by_move_somewhere == true, but this way its safer)
|
||||
if (caused_by_move_somewhere && move_count == 0) {
|
||||
if (caused_by_move_somewhere && move_count == 0)
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
Record rollback information
|
||||
*/
|
||||
if(!ignore_rollback && gamedef->rollback())
|
||||
{
|
||||
if (!ignore_rollback && gamedef->rollback()) {
|
||||
IRollbackManager *rollback = gamedef->rollback();
|
||||
|
||||
// If source is not infinite, record item take
|
||||
|
|
@ -474,23 +448,18 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
// Both endpoints are same detached
|
||||
if (from_inv.type == InventoryLocation::DETACHED &&
|
||||
to_inv.type == InventoryLocation::DETACHED &&
|
||||
from_inv.name == to_inv.name)
|
||||
{
|
||||
from_inv.name == to_inv.name) {
|
||||
PLAYER_TO_SA(player)->detached_inventory_OnMove(
|
||||
from_inv.name, from_list, from_i,
|
||||
to_list, to_i, count, player);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Destination is detached
|
||||
if(to_inv.type == InventoryLocation::DETACHED)
|
||||
{
|
||||
if (to_inv.type == InventoryLocation::DETACHED) {
|
||||
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)
|
||||
{
|
||||
if (from_inv.type == InventoryLocation::DETACHED) {
|
||||
PLAYER_TO_SA(player)->detached_inventory_OnTake(
|
||||
from_inv.name, from_list, from_i, src_item, player);
|
||||
}
|
||||
|
|
@ -501,22 +470,18 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
// Both endpoints are same nodemeta
|
||||
if (from_inv.type == InventoryLocation::NODEMETA &&
|
||||
to_inv.type == InventoryLocation::NODEMETA &&
|
||||
from_inv.p == to_inv.p)
|
||||
{
|
||||
from_inv.p == to_inv.p) {
|
||||
PLAYER_TO_SA(player)->nodemeta_inventory_OnMove(
|
||||
from_inv.p, from_list, from_i,
|
||||
to_list, to_i, count, player);
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
// Destination is nodemeta
|
||||
if(to_inv.type == InventoryLocation::NODEMETA)
|
||||
{
|
||||
if (to_inv.type == InventoryLocation::NODEMETA) {
|
||||
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)
|
||||
{
|
||||
else if (from_inv.type == InventoryLocation::NODEMETA) {
|
||||
PLAYER_TO_SA(player)->nodemeta_inventory_OnTake(
|
||||
from_inv.p, from_list, from_i, src_item, player);
|
||||
}
|
||||
|
|
@ -598,8 +563,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
<<"from_inv=\""<<from_inv.dump()<<"\""<<std::endl;
|
||||
return;
|
||||
}
|
||||
if(list_from->getItem(from_i).empty())
|
||||
{
|
||||
if (list_from->getItem(from_i).empty()) {
|
||||
infostream<<"IDropAction::apply(): FAIL: source item not found: "
|
||||
<<"from_inv=\""<<from_inv.dump()<<"\""
|
||||
<<", from_list=\""<<from_list<<"\""
|
||||
|
|
@ -622,8 +586,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
int src_can_take_count = take_count;
|
||||
|
||||
// Source is detached
|
||||
if(from_inv.type == InventoryLocation::DETACHED)
|
||||
{
|
||||
if (from_inv.type == InventoryLocation::DETACHED) {
|
||||
ItemStack src_item = list_from->getItem(from_i);
|
||||
src_item.count = take_count;
|
||||
src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowTake(
|
||||
|
|
@ -631,8 +594,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
}
|
||||
|
||||
// Source is nodemeta
|
||||
if(from_inv.type == InventoryLocation::NODEMETA)
|
||||
{
|
||||
if (from_inv.type == InventoryLocation::NODEMETA) {
|
||||
ItemStack src_item = list_from->getItem(from_i);
|
||||
src_item.count = take_count;
|
||||
src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowTake(
|
||||
|
|
@ -650,8 +612,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
ItemStack item1 = list_from->getItem(from_i);
|
||||
item1.count = take_count;
|
||||
if (PLAYER_TO_SA(player)->item_OnDrop(item1, player,
|
||||
player->getBasePosition() + v3f(0,1,0)))
|
||||
{
|
||||
player->getBasePosition() + v3f(0,1,0))) {
|
||||
actually_dropped_count = take_count - item1.count;
|
||||
|
||||
if (actually_dropped_count == 0) {
|
||||
|
|
@ -684,15 +645,13 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
*/
|
||||
|
||||
// Source is detached
|
||||
if(from_inv.type == InventoryLocation::DETACHED)
|
||||
{
|
||||
if (from_inv.type == InventoryLocation::DETACHED) {
|
||||
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)
|
||||
{
|
||||
if (from_inv.type == InventoryLocation::NODEMETA) {
|
||||
PLAYER_TO_SA(player)->nodemeta_inventory_OnTake(
|
||||
from_inv.p, from_list, from_i, src_item, player);
|
||||
}
|
||||
|
|
@ -700,8 +659,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
|
|||
/*
|
||||
Record rollback information
|
||||
*/
|
||||
if(!ignore_src_rollback && gamedef->rollback())
|
||||
{
|
||||
if (!ignore_src_rollback && gamedef->rollback()) {
|
||||
IRollbackManager *rollback = gamedef->rollback();
|
||||
|
||||
// If source is not infinite, record item take
|
||||
|
|
@ -908,11 +866,9 @@ bool getCraftingResult(Inventory *inv, ItemStack& result,
|
|||
if (found)
|
||||
result.deSerialize(co.item, gamedef->getItemDefManager());
|
||||
|
||||
if(found && decrementInput)
|
||||
{
|
||||
if (found && decrementInput) {
|
||||
// CraftInput has been changed, apply changes in clist
|
||||
for(u16 i=0; i<clist->getSize(); i++)
|
||||
{
|
||||
for (u16 i=0; i < clist->getSize(); i++) {
|
||||
clist->changeItem(i, ci.items[i]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,15 +117,17 @@ public:
|
|||
virtual void inventoryAction(InventoryAction *a){}
|
||||
};
|
||||
|
||||
#define IACTION_MOVE 0
|
||||
#define IACTION_DROP 1
|
||||
#define IACTION_CRAFT 2
|
||||
enum class IAction : u16 {
|
||||
Move,
|
||||
Drop,
|
||||
Craft
|
||||
};
|
||||
|
||||
struct InventoryAction
|
||||
{
|
||||
static InventoryAction *deSerialize(std::istream &is);
|
||||
|
||||
virtual u16 getType() const = 0;
|
||||
virtual IAction getType() const = 0;
|
||||
virtual void serialize(std::ostream &os) const = 0;
|
||||
virtual void apply(InventoryManager *mgr, ServerActiveObject *player,
|
||||
IGameDef *gamedef) = 0;
|
||||
|
|
@ -136,35 +138,27 @@ struct InventoryAction
|
|||
struct IMoveAction : public InventoryAction
|
||||
{
|
||||
// count=0 means "everything"
|
||||
u16 count;
|
||||
u16 count = 0;
|
||||
InventoryLocation from_inv;
|
||||
std::string from_list;
|
||||
s16 from_i;
|
||||
s16 from_i = -1;
|
||||
InventoryLocation to_inv;
|
||||
std::string to_list;
|
||||
s16 to_i;
|
||||
bool move_somewhere;
|
||||
s16 to_i = -1;
|
||||
bool move_somewhere = false;
|
||||
|
||||
// treat these as private
|
||||
// related to movement to somewhere
|
||||
bool caused_by_move_somewhere;
|
||||
u32 move_count;
|
||||
bool caused_by_move_somewhere = false;
|
||||
u32 move_count = 0;
|
||||
|
||||
IMoveAction()
|
||||
{
|
||||
count = 0;
|
||||
from_i = -1;
|
||||
to_i = -1;
|
||||
move_somewhere = false;
|
||||
caused_by_move_somewhere = false;
|
||||
move_count = 0;
|
||||
}
|
||||
IMoveAction() {}
|
||||
|
||||
IMoveAction(std::istream &is, bool somewhere);
|
||||
|
||||
u16 getType() const
|
||||
IAction getType() const
|
||||
{
|
||||
return IACTION_MOVE;
|
||||
return IAction::Move;
|
||||
}
|
||||
|
||||
void serialize(std::ostream &os) const
|
||||
|
|
@ -191,22 +185,18 @@ struct IMoveAction : public InventoryAction
|
|||
struct IDropAction : public InventoryAction
|
||||
{
|
||||
// count=0 means "everything"
|
||||
u16 count;
|
||||
u16 count = 0;
|
||||
InventoryLocation from_inv;
|
||||
std::string from_list;
|
||||
s16 from_i;
|
||||
s16 from_i = -1;
|
||||
|
||||
IDropAction()
|
||||
{
|
||||
count = 0;
|
||||
from_i = -1;
|
||||
}
|
||||
IDropAction() {}
|
||||
|
||||
IDropAction(std::istream &is);
|
||||
|
||||
u16 getType() const
|
||||
IAction getType() const
|
||||
{
|
||||
return IACTION_DROP;
|
||||
return IAction::Drop;
|
||||
}
|
||||
|
||||
void serialize(std::ostream &os) const
|
||||
|
|
@ -226,19 +216,16 @@ struct IDropAction : public InventoryAction
|
|||
struct ICraftAction : public InventoryAction
|
||||
{
|
||||
// count=0 means "everything"
|
||||
u16 count;
|
||||
u16 count = 0;
|
||||
InventoryLocation craft_inv;
|
||||
|
||||
ICraftAction()
|
||||
{
|
||||
count = 0;
|
||||
}
|
||||
ICraftAction() {}
|
||||
|
||||
ICraftAction(std::istream &is);
|
||||
|
||||
u16 getType() const
|
||||
IAction getType() const
|
||||
{
|
||||
return IACTION_CRAFT;
|
||||
return IAction::Craft;
|
||||
}
|
||||
|
||||
void serialize(std::ostream &os) const
|
||||
|
|
|
|||
|
|
@ -908,7 +908,7 @@ void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
|
|||
std::istringstream is(datastring, std::ios_base::binary);
|
||||
// Create an action
|
||||
InventoryAction *a = InventoryAction::deSerialize(is);
|
||||
if (a == NULL) {
|
||||
if (!a) {
|
||||
infostream << "TOSERVER_INVENTORY_ACTION: "
|
||||
<< "InventoryAction::deSerialize() returned NULL"
|
||||
<< std::endl;
|
||||
|
|
@ -927,7 +927,7 @@ void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
|
|||
/*
|
||||
Handle restrictions and special cases of the move action
|
||||
*/
|
||||
if (a->getType() == IACTION_MOVE) {
|
||||
if (a->getType() == IAction::Move) {
|
||||
IMoveAction *ma = (IMoveAction*)a;
|
||||
|
||||
ma->from_inv.applyCurrentPlayer(player->getName());
|
||||
|
|
@ -982,7 +982,7 @@ void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
|
|||
/*
|
||||
Handle restrictions and special cases of the drop action
|
||||
*/
|
||||
else if (a->getType() == IACTION_DROP) {
|
||||
else if (a->getType() == IAction::Drop) {
|
||||
IDropAction *da = (IDropAction*)a;
|
||||
|
||||
da->from_inv.applyCurrentPlayer(player->getName());
|
||||
|
|
@ -1018,7 +1018,7 @@ void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
|
|||
/*
|
||||
Handle restrictions and special cases of the craft action
|
||||
*/
|
||||
else if (a->getType() == IACTION_CRAFT) {
|
||||
else if (a->getType() == IAction::Craft) {
|
||||
ICraftAction *ca = (ICraftAction*)a;
|
||||
|
||||
ca->craft_inv.applyCurrentPlayer(player->getName());
|
||||
|
|
|
|||
Loading…
Reference in New Issue