oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-22 17:18:39 +00:00
Code Wiki Activity

MoveItemSomewhere double bugfix

Browse source 
-> Fix bug where MoveSomewhere from an infinite source would fill the destination inventory with copies of itself.
-> Fix bug where MoveSomewhere would needlessly call callbacks.
-> Remove trailing whitespaces
This commit is contained in:
est31 2015-07-19 02:27:12 +02:00
parent 4046f3e302
commit 7bbb9b066a
2 changed files with 47 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/inventorymanager.h
View file

@ -108,7 +108,7 @@ class InventoryManager
public:
InventoryManager(){}
virtual ~InventoryManager(){}
// Get an inventory (server and client)
virtual Inventory* getInventory(const InventoryLocation &loc){return NULL;}
// Set modified (will be saved and sent over network; only on server)
@ -124,7 +124,7 @@ public:
struct InventoryAction
{
static InventoryAction * deSerialize(std::istream &is);
virtual u16 getType() const = 0;
virtual void serialize(std::ostream &os) const = 0;
virtual void apply(InventoryManager *mgr, ServerActiveObject *player,
@ -149,7 +149,7 @@ struct IMoveAction : public InventoryAction
// related to movement to somewhere
bool caused_by_move_somewhere;
u32 move_count;
IMoveAction()
{
count = 0;
@ -159,7 +159,7 @@ struct IMoveAction : public InventoryAction
caused_by_move_somewhere = false;
move_count = 0;
}
IMoveAction(std::istream &is, bool somewhere);
u16 getType() const
@ -195,13 +195,13 @@ struct IDropAction : public InventoryAction
InventoryLocation from_inv;
std::string from_list;
s16 from_i;
IDropAction()
{
count = 0;
from_i = -1;
}
IDropAction(std::istream &is);
u16 getType() const
@ -228,12 +228,12 @@ struct ICraftAction : public InventoryAction
// count=0 means "everything"
u16 count;
InventoryLocation craft_inv;
ICraftAction()
{
count = 0;
}
ICraftAction(std::istream &is);
u16 getType() const