use data.read and remove was_loaded

CleverRaven · Jan 4, 2020 · e898705 · e898705
1 parent d538dc4
commit e898705
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/item_contents.h b/src/item_contents.h
@@ -107,8 +107,6 @@ class item_contents
 
         void serialize( JsonOut &json ) const;
         void deserialize( JsonIn &jsin );
-
-        bool was_loaded;
     private:
         // gets the pocket described as legacy, or creates one
         item_pocket &legacy_pocket();

diff --git a/src/item_pocket.h b/src/item_pocket.h
@@ -137,8 +137,6 @@ class item_pocket
         void deserialize( JsonIn &jsin );
 
         bool operator==( const item_pocket &rhs ) const;
-
-        bool was_loaded;
     private:
         const pocket_data *data = nullptr;
         // the items inside the pocket

diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp
@@ -163,7 +163,7 @@ void item_contents::serialize( JsonOut &json ) const
 void item_contents::deserialize( JsonIn &jsin )
 {
     JsonObject data = jsin.get_object();
-    optional( data, was_loaded, "contents", contents );
+    data.read( "contents", contents );
 }
 
 void item_pocket::serialize( JsonOut &json ) const
@@ -178,7 +178,7 @@ void item_pocket::serialize( JsonOut &json ) const
 void item_pocket::deserialize( JsonIn &jsin )
 {
     JsonObject data = jsin.get_object();
-    optional( data, was_loaded, "contents", contents );
+    data.read( "contents", contents );
 }
 
 std::vector<item> item::magazine_convert()