This was originally going to be a small refactor of stash.cc before

getting into stash/item finding, but it ended up big.  Removed the
read/writeThing API in favor of the marshall/unmarshallThing API.  It
was slightly awkward in a couple spots where the format of writeThing
and marshallThing differed slightly (strings, level_id, level_pos).

Doesn't affect savegames.

When it's is okay to break savegames (maybe just before releasing
0.4?) it would be nice to remove the few remaining redundancies listed
above.



git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3828 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 12 insertions, 10 deletions

diff --git a/crawl-ref/source/Kills.h b/crawl-ref/source/Kills.h
index 9f7b002ea5..897725df76 100644
--- a/crawl-ref/source/Kills.h
+++ b/crawl-ref/source/Kills.h
@@ -18,6 +18,8 @@
 std::string apostrophise(const std::string &name);
 
 class monsters;
+class reader;
+class writer;
 
 // Not intended for external use!
 struct kill_monster_desc
@@ -25,8 +27,8 @@ struct kill_monster_desc
     kill_monster_desc(const monsters *);
     kill_monster_desc() { }
 
-    void save(FILE*) const;
-    void load(FILE*);
+    void save(writer&) const;
+    void load(reader&);
 
     enum name_modifier
     {
@@ -58,8 +60,8 @@ public:
         // This object just says to the world that it's uninitialized
     }
 
-    void save(FILE*) const;
-    void load(FILE*);
+    void save(writer&) const;
+    void load(reader&);
 
     void add_kill(const monsters *mon, unsigned short place);
     void add_place(unsigned short place, bool force = false);
@@ -86,8 +88,8 @@ public:
     kill_ghost(const monsters *mon);
     kill_ghost() { }
 
-    void save(FILE*) const;
-    void load(FILE*);
+    void save(writer&) const;
+    void load(reader&);
 
     std::string info() const;
 
@@ -138,8 +140,8 @@ public:
     void merge(const Kills &k);
 
     bool empty() const;
-    void save(FILE*) const;
-    void load(FILE*);
+    void save(writer&) const;
+    void load(reader&);
 
     long get_kills(std::vector<kill_exp> &v) const;
 private:
@@ -164,8 +166,8 @@ public:
     void record_kill(const monsters *mon, int killer, bool ispet);
 
     bool empty() const;
-    void save(FILE*) const;
-    void load(FILE*);
+    void save(writer&) const;
+    void load(reader&);
 
     std::string kill_info() const;
 private: