Changeset 497

Timestamp:

08/11/07 15:57:43 (1 year ago)

Author:

takkaria

Message:

Add bits of missing data to the savefile, and rearrange a little.

Files:

• trunk/src/loadsave.c (modified) (14 diffs)

trunk/src/loadsave.c

@@ -41 +41 @@
-void deserialize_artifact(artifact_type *a_ptr, smap_t *smap);
-
-void save_object(block_t *block, object_type *o_ptr);
-void save_object_memory(block_t *block, object_kind *k_ptr);
-void save_monster(block_t *block, monster_type *m_ptr);
@@ -48 +47 @@
-void save_artifact(block_t *block, artifact_type *a_ptr);
-
-void load_object(object_type *o_ptr, smap_t *smap);
-void load_object_memory(object_kind *k_ptr, smap_t *smap);
-void load_monster(monster_type *m_ptr, smap_t *smap);
-void load_lore(monster_race *r_ptr, monster_lore *l_ptr, smap_t *smap);
@@ -62 +59 @@
-void save_objects(blockfile_t *bf);
-void save_object_memories(blockfile_t *bf);
+void save_artifact_status(blockfile_t *bf);
-void save_monsters(blockfile_t *bf);
-void save_lores(blockfile_t *bf);
@@ -78 +76 @@
-void load_player_inventory(blockfile_t *bf);
-void load_object_memories(blockfile_t *bf);
+void load_artifact_status(blockfile_t *bf);
-void load_cave(blockfile_t *bf);
-void load_objects(blockfile_t *bf);
@@ -139 +138 @@
-        save_objects(bf);
-        save_object_memories(bf);
+        save_artifact_status(bf);
-        save_monsters(bf);
-        save_stores(bf);
@@ -185 +185 @@
-        load_objects(bf);
-        load_object_memories(bf);
+        load_artifact_status(bf);
-        load_stores(bf);
-        load_options(bf);
@@ -310 +311 @@
-
-        for (i = 1; i < o_max; i++)
-
+
+
+
+
+
-}
-
@@ -319 +324 @@
-
-        for (i = 1; i < z_info->k_max; i++)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -526 +558 @@
-                blob = smap_get_blob(sm, "object", &len);
-                obj_smap = smap_fromstring(blob, len);
-load
+deserialize
-                smap_free(obj_smap);
-                FREE(blob);
@@ -602 +634 @@
-
-                o_ptr = &o_list[o_idx];
-load
+deserialize
-                smap_free(s);
-
@@ -631 +663 @@
-        for (i = 1; i < z_info->k_max; i++)
-        {
+                object_kind *k_ptr = &k_info[i];
-                smap_t *sm = load_smap(object_block);
-                if (!sm) break;
-
-
+
+
+
+
+
-                smap_free(sm);
-        }
-}
-
+void load_artifact_status(blockfile_t *bf)
+{
+        block_t *art_block = bf_findblock(bf, "artifacts");
+        u32b i;
+
+        for (i = 1; i < z_info->a_max; i++)
+        {
+                smap_t *s = load_smap(art_block);
+                if (!s) return;
+
+                a_info[i].cur_num = smap_get_bool(s, "created") ? 1 : 0;
+
+                smap_free(s);
+        }
+}
+
-void load_monsters(blockfile_t *bf)
-{
-        block_t *monster_block = bf_findblock(bf, "monsters");
-        u32b i;
-        smap_t *s;
-        monster_type mon;
-
-        for (i = 1; i < z_info->m_max; i++)
-        {
-
+map_t *s
-                if (!s) return;
-
@@ -838 +890 @@
-/* Low-level functions */
-
-void save_object_memory(block_t *block, object_kind *k_ptr)
-{
-        smap_t *sm = smap_new();
-
-        if (k_ptr->aware) smap_put_bool(sm, "aware", TRUE);
-        if (k_ptr->tried) smap_put_bool(sm, "tried", TRUE);
-        if (k_ptr->squelch) smap_put_bool(sm, "squelch", TRUE);
-        if (k_ptr->everseen) smap_put_bool(sm, "everseen", TRUE);
-
-        save_smap(block, sm);
-        smap_free(sm);
-}
-
-void save_object(block_t *block, object_type *o_ptr)
-{
-        smap_t *sm = serialize_object(o_ptr);
-        save_smap(block, sm);
-        smap_free(sm);
-}
-
-void save_monster(block_t *block, monster_type *m_ptr)
-{
@@ -884 +916 @@
-        save_smap(block, sm);
-        smap_free(sm);
-}
-
-void load_object(object_type *o_ptr, smap_t *smap)
-{
-        deserialize_object(o_ptr, smap);
-}
-
-void load_object_memory(object_kind *k_ptr, smap_t *sm)
-{
-        k_ptr->aware = smap_get_bool(sm, "aware");
-        k_ptr->tried = smap_get_bool(sm, "tried");
-        k_ptr->squelch = smap_get_bool(sm, "squelch");
-        k_ptr->everseen = smap_get_bool(sm, "everseen");
-}
-
@@ -1574 +1593 @@
-        a_ptr->time_sides = smap_get_u16b(s, "time_sides");
-}
+