From 27e3a353d84c974dfea113df0eaa0aa7e93b7c6b Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 21 Apr 2015 22:24:45 +0200 Subject: Remove craftdef serialisation It isn't needed anymore, sending ICraftDefManager over the network has been obsoleted by protocol version 7. --- src/craftdef.h | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) (limited to 'src/craftdef.h') diff --git a/src/craftdef.h b/src/craftdef.h index cc7a0619c..f62ad3313 100644 --- a/src/craftdef.h +++ b/src/craftdef.h @@ -128,8 +128,6 @@ struct CraftReplacements pairs(pairs_) {} std::string dump() const; - void serialize(std::ostream &os) const; - void deSerialize(std::istream &is); }; /* @@ -141,9 +139,6 @@ public: CraftDefinition(){} virtual ~CraftDefinition(){} - void serialize(std::ostream &os) const; - static CraftDefinition* deSerialize(std::istream &is); - // Returns type of crafting definition virtual std::string getName() const=0; @@ -164,9 +159,6 @@ public: virtual void initHash(IGameDef *gamedef) = 0; virtual std::string dump() const=0; -protected: - virtual void serializeBody(std::ostream &os) const=0; - virtual void deSerializeBody(std::istream &is, int version)=0; }; /* @@ -204,10 +196,6 @@ public: virtual std::string dump() const; -protected: - virtual void serializeBody(std::ostream &os) const; - virtual void deSerializeBody(std::istream &is, int version); - private: // Output itemstring std::string output; @@ -256,10 +244,6 @@ public: virtual std::string dump() const; -protected: - virtual void serializeBody(std::ostream &os) const; - virtual void deSerializeBody(std::istream &is, int version); - private: // Output itemstring std::string output; @@ -303,10 +287,6 @@ public: virtual std::string dump() const; -protected: - virtual void serializeBody(std::ostream &os) const; - virtual void deSerializeBody(std::istream &is, int version); - private: // This is a constant that is added to the wear of the result. // May be positive or negative, allowed range [-1,1]. @@ -349,10 +329,6 @@ public: virtual std::string dump() const; -protected: - virtual void serializeBody(std::ostream &os) const; - virtual void deSerializeBody(std::istream &is, int version); - private: // Output itemstring std::string output; @@ -398,10 +374,6 @@ public: virtual std::string dump() const; -protected: - virtual void serializeBody(std::ostream &os) const; - virtual void deSerializeBody(std::istream &is, int version); - private: // Recipe itemstring std::string recipe; @@ -429,7 +401,7 @@ public: bool decrementInput, IGameDef *gamedef) const=0; virtual std::vector getCraftRecipes(CraftOutput &output, IGameDef *gamedef, unsigned limit=0) const=0; - + // Print crafting recipes for debugging virtual std::string dump() const=0; }; @@ -443,7 +415,7 @@ public: // The main crafting function virtual bool getCraftResult(CraftInput &input, CraftOutput &output, bool decrementInput, IGameDef *gamedef) const=0; - virtual std::vector getCraftRecipes(CraftOutput &output, + virtual std::vector getCraftRecipes(CraftOutput &output, IGameDef *gamedef, unsigned limit=0) const=0; // Print crafting recipes for debugging -- cgit v1.2.3