盗賊ギルドの「分け前」の仕様を廃止。

[hengband/hengband.git] / src / save.c

diff --git a/src/save.c b/src/save.c
index f8e9c30..a9d9fb4 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -1,5 +1,13 @@
 /* File: save.c */
 
+/*
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
+ *
+ * This software may be copied and distributed for educational, research,
+ * and not for profit purposes provided that this copyright and statement
+ * are included in all such copies.  Other copyrights may also apply.
+ */
+
 /* Purpose: interact with savefiles */
 
 #include "angband.h"
@@ -194,6 +202,7 @@ static void wr_monster(monster_type *m_ptr)
        if (m_ptr->exp) flags |= SAVE_MON_EXP;
        if (m_ptr->mflag2) flags |= SAVE_MON_MFLAG2;
        if (m_ptr->nickname) flags |= SAVE_MON_NICKNAME;
+       if (m_ptr->parent_m_idx) flags |= SAVE_MON_PARENT;
 
        /*** Monster save flags ***/
        wr_u32b(flags);
@@ -227,6 +236,7 @@ static void wr_monster(monster_type *m_ptr)
        if (flags & SAVE_MON_EXP) wr_u32b(m_ptr->exp);
        if (flags & SAVE_MON_MFLAG2) wr_byte(m_ptr->mflag2);
        if (flags & SAVE_MON_NICKNAME) wr_string(quark_str(m_ptr->nickname));
+       if (flags & SAVE_MON_PARENT) wr_s16b(m_ptr->parent_m_idx);
 }
 
 
@@ -272,6 +282,7 @@ static void wr_lore(int r_idx)
        wr_u32b(r_ptr->r_flags4);
        wr_u32b(r_ptr->r_flags5);
        wr_u32b(r_ptr->r_flags6);
+       wr_u32b(r_ptr->r_flagsr);
 
 
        /* Monster limit per level */
@@ -383,6 +394,8 @@ static void wr_options(void)
        /* Write "hitpoint_warn" */
        wr_byte(hitpoint_warn);
 
+       /* Write "mana_warn" */
+       wr_byte(mana_warn);
 
        /*** Cheating options ***/
 
@@ -523,6 +536,8 @@ static void wr_extra(void)
 
        wr_string(p_ptr->died_from);
 
+       wr_string(p_ptr->last_message ? p_ptr->last_message : "");
+
        save_quick_start();
 
        for (i = 0; i < 4; i++)
@@ -557,6 +572,7 @@ static void wr_extra(void)
        wr_u32b(p_ptr->au);
 
        wr_u32b(p_ptr->max_exp);
+       wr_u32b(p_ptr->max_max_exp);
        wr_u32b(p_ptr->exp);
        wr_u16b(p_ptr->exp_frac);
        wr_s16b(p_ptr->lev);
@@ -598,15 +614,13 @@ static void wr_extra(void)
        wr_s16b(p_ptr->inside_quest);
        wr_s16b(p_ptr->inside_battle);
        wr_byte(p_ptr->exit_bldg);
-       wr_byte(p_ptr->leftbldg); /* save building leave status -KMW- */
+       wr_byte(0); /* Unused */
 
        wr_s16b(p_ptr->oldpx);
        wr_s16b(p_ptr->oldpy);
 
-       /* Save builing rewards */
-       wr_s16b(MAX_BACT);
-
-       for (i = 0; i < MAX_BACT; i++) wr_s16b(p_ptr->rewards[i]);
+       /* Was number of p_ptr->rewards[] */
+       wr_s16b(0);
 
        wr_s16b(p_ptr->mhp);
        wr_s16b(p_ptr->chp);
@@ -704,7 +718,7 @@ static void wr_extra(void)
        wr_s16b(p_ptr->ele_immune);
        wr_u32b(p_ptr->special_defense);
        wr_byte(p_ptr->knowledge);
-       wr_byte(0);     /* oops */
+       wr_byte(p_ptr->autopick_autoregister);
        wr_byte(0);     /* oops */
        wr_byte(p_ptr->action);
        wr_byte(0);
@@ -754,6 +768,9 @@ static void wr_extra(void)
        /* Current floor_id */
        wr_s16b(p_ptr->floor_id);
 
+       /* Save temporary preserved pets (obsolated) */
+       wr_s16b(0);
+
        wr_u32b(playtime);
 
        wr_s32b(p_ptr->visit);
@@ -1077,7 +1094,7 @@ static bool wr_dungeon(void)
        wr_byte(dungeon_type);
 
 
-       /*** On the surface  ***/
+       /*** No saved floor (On the surface etc.) ***/
        if (!p_ptr->floor_id)
        {
                /* No array elements */
@@ -1223,8 +1240,22 @@ static bool wr_savefile_new(void)
 
        /* Space */
        wr_u32b(0L);
-       wr_u32b(0L);
+       wr_u16b(0);
+       wr_byte(0);
 
+#ifdef JP
+# ifdef EUC
+       /* EUC kanji code */
+       wr_byte(2);
+# endif
+# ifdef SJIS
+       /* SJIS kanji code */
+       wr_byte(3);
+# endif
+#else
+       /* ASCII */
+       wr_byte(1);
+#endif
 
        /* Write the RNG state */
        wr_randomizer();
@@ -1281,7 +1312,7 @@ static bool wr_savefile_new(void)
                wr_byte(quest[i].complev);
 
                /* Save quest status if quest is running */
-               if (quest[i].status == QUEST_STATUS_TAKEN || quest[i].status == QUEST_STATUS_COMPLETED || ((i >= MIN_RANDOM_QUEST) && (i <= MAX_RANDOM_QUEST)))
+               if (quest[i].status == QUEST_STATUS_TAKEN || quest[i].status == QUEST_STATUS_COMPLETED || !is_fixed_quest_idx(i))
                {
                        wr_s16b(quest[i].cur_num);
                        wr_s16b(quest[i].max_num);
@@ -1454,18 +1485,30 @@ static bool save_player_aux(char *name)
        FILE_TYPE(FILE_TYPE_SAVE);
 
 
+       /* Grab permissions */
+       safe_setuid_grab();
+
        /* Create the savefile */
        fd = fd_make(name, mode);
 
+       /* Drop permissions */
+       safe_setuid_drop();
+
        /* File is okay */
        if (fd >= 0)
        {
                /* Close the "fd" */
                (void)fd_close(fd);
 
+               /* Grab permissions */
+               safe_setuid_grab();
+
                /* Open the savefile */
                fff = my_fopen(name, "wb");
 
+               /* Drop permissions */
+               safe_setuid_drop();
+
                /* Successful open */
                if (fff)
                {
@@ -1476,8 +1519,14 @@ static bool save_player_aux(char *name)
                        if (my_fclose(fff)) ok = FALSE;
                }
 
+               /* Grab permissions */
+               safe_setuid_grab();
+
                /* Remove "broken" files */
                if (!ok) (void)fd_kill(name);
+
+               /* Drop permissions */
+               safe_setuid_drop();
        }
 
 
@@ -1527,9 +1576,15 @@ bool save_player(void)
        strcat(safe, "n");
 #endif /* VM */
 
+       /* Grab permissions */
+       safe_setuid_grab();
+
        /* Remove it */
        fd_kill(safe);
 
+       /* Drop permissions */
+       safe_setuid_drop();
+
        update_playtime();
 
        /* Attempt to save the player */
@@ -1547,6 +1602,9 @@ bool save_player(void)
                strcat(temp, "o");
 #endif /* VM */
 
+               /* Grab permissions */
+               safe_setuid_grab();
+
                /* Remove it */
                fd_kill(temp);
 
@@ -1559,6 +1617,9 @@ bool save_player(void)
                /* Remove preserved savefile */
                fd_kill(temp);
 
+               /* Drop permissions */
+               safe_setuid_drop();
+
                /* Hack -- Pretend the character was loaded */
                character_loaded = TRUE;
 
@@ -1568,9 +1629,15 @@ bool save_player(void)
                strcpy(temp, savefile);
                strcat(temp, ".lok");
 
+               /* Grab permissions */
+               safe_setuid_grab();
+
                /* Remove lock file */
                fd_kill(temp);
 
+               /* Drop permissions */
+               safe_setuid_drop();
+
 #endif
 
                /* Success */
@@ -2050,9 +2117,16 @@ bool save_floor(saved_floor_type *sf_ptr, u32b mode)
        /* New savefile */
        sprintf(floor_savefile, "%s.F%02d", savefile, (int)sf_ptr->savefile_id);
 
+       /* Grab permissions */
+       safe_setuid_grab();
+
        /* Remove it */
        fd_kill(floor_savefile);
 
+       /* Drop permissions */
+       safe_setuid_drop();
+
+
        /* Attempt to save the player */
 
        /* No file yet */
@@ -2061,18 +2135,30 @@ bool save_floor(saved_floor_type *sf_ptr, u32b mode)
        /* File type is "SAVE" */
        FILE_TYPE(FILE_TYPE_SAVE);
 
+       /* Grab permissions */
+       safe_setuid_grab();
+
        /* Create the savefile */
        fd = fd_make(floor_savefile, 0644);
 
+       /* Drop permissions */
+       safe_setuid_drop();
+
        /* File is okay */
        if (fd >= 0)
        {
                /* Close the "fd" */
                (void)fd_close(fd);
 
+               /* Grab permissions */
+               safe_setuid_grab();
+
                /* Open the savefile */
                fff = my_fopen(floor_savefile, "wb");
 
+               /* Drop permissions */
+               safe_setuid_drop();
+
                /* Successful open */
                if (fff)
                {
@@ -2084,7 +2170,16 @@ bool save_floor(saved_floor_type *sf_ptr, u32b mode)
                }
 
                /* Remove "broken" files */
-               if (!ok) (void)fd_kill(floor_savefile);
+               if (!ok)
+               {
+                       /* Grab permissions */
+                       safe_setuid_grab();
+
+                       (void)fd_kill(floor_savefile);
+
+                       /* Drop permissions */
+                       safe_setuid_drop();
+               }
        }
 
        if (!(mode & SLF_SECOND))