/*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
CURRENT_PLAYER,
PLAYER,
NODEMETA,
+ DETACHED,
} type;
- std::string name; // PLAYER
+ std::string name; // PLAYER, DETACHED
v3s16 p; // NODEMETA
InventoryLocation()
type = NODEMETA;
p = p_;
}
+ void setDetached(const std::string &name_)
+ {
+ type = DETACHED;
+ name = name_;
+ }
+
+ bool operator==(const InventoryLocation &other) const
+ {
+ if(type != other.type)
+ return false;
+ switch(type){
+ case UNDEFINED:
+ return false;
+ case CURRENT_PLAYER:
+ return true;
+ case PLAYER:
+ return (name == other.name);
+ case NODEMETA:
+ return (p == other.p);
+ case DETACHED:
+ return (name == other.name);
+ }
+ return false;
+ }
+ bool operator!=(const InventoryLocation &other) const
+ {
+ return !(*this == other);
+ }
void applyCurrentPlayer(const std::string &name_)
{
public:
InventoryManager(){}
virtual ~InventoryManager(){}
-
- // Get an inventory or set it modified (so it will be updated over
- // network or so)
- virtual Inventory* getInventory(const InventoryLocation &loc){return NULL;}
- virtual std::string getInventoryOwner(const InventoryLocation &loc){return "";}
- virtual void setInventoryModified(const InventoryLocation &loc){}
- // Used on the client to send an action to the server
+ // 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)
+ virtual void setInventoryModified(const InventoryLocation &loc, bool playerSend = true){}
+ // Send inventory action to server (only on client)
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;
+ static InventoryAction *deSerialize(std::istream &is);
+
+ virtual IAction getType() const = 0;
virtual void serialize(std::ostream &os) const = 0;
virtual void apply(InventoryManager *mgr, ServerActiveObject *player,
IGameDef *gamedef) = 0;
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;
-
- IMoveAction()
- {
- count = 0;
- from_i = -1;
- to_i = -1;
- }
-
- IMoveAction(std::istream &is);
+ s16 to_i = -1;
+ bool move_somewhere = false;
- u16 getType() const
+ // treat these as private
+ // related to movement to somewhere
+ bool caused_by_move_somewhere = false;
+ u32 move_count = 0;
+
+ IMoveAction() {}
+
+ IMoveAction(std::istream &is, bool somewhere);
+
+ IAction getType() const
{
- return IACTION_MOVE;
+ return IAction::Move;
}
void serialize(std::ostream &os) const
{
- os<<"Move ";
- os<<count<<" ";
- os<<from_inv.dump()<<" ";
- os<<from_list<<" ";
- os<<from_i<<" ";
- os<<to_inv.dump()<<" ";
- os<<to_list<<" ";
- os<<to_i;
+ if (!move_somewhere)
+ os << "Move ";
+ else
+ os << "MoveSomewhere ";
+ os << count << " ";
+ os << from_inv.dump() << " ";
+ os << from_list << " ";
+ os << from_i << " ";
+ os << to_inv.dump() << " ";
+ os << to_list;
+ if (!move_somewhere)
+ os << " " << to_i;
}
void apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef);
struct IDropAction : public InventoryAction
{
// count=0 means "everything"
- u16 count;
+ u16 count = 0;
InventoryLocation from_inv;
std::string from_list;
- s16 from_i;
-
- IDropAction()
- {
- count = 0;
- from_i = -1;
- }
-
+ s16 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
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
};
// Crafting helper
-bool getCraftingResult(Inventory *inv, ItemStack& result,
+bool getCraftingResult(Inventory *inv, ItemStack &result,
+ std::vector<ItemStack> &output_replacements,
bool decrementInput, IGameDef *gamedef);
#endif