Commit: ca836324a1540c6dc76f7e3ecc212bf66fc1d36e - source (git)

patch投げ用

Commit MetaInfo

• Revision: ca836324a1540c6dc76f7e3ecc212bf66fc1d36e (tree)
• Time: 2016-02-10 22:21:32
• Author: SHIRAKATA Kentaro <argrath@ub32...>
• Commiter: SHIRAKATA Kentaro

Log Message

fix C360-19

Change Summary

• modified: include/you.h
• modified: src/allmain.c
• modified: src/end.c
• modified: src/restore.c
• modified: src/save.c
• modified: src/topten.c

Incremental Difference

--- a/include/you.h
+++ b/include/you.h
@@ -68,10 +68,11 @@ struct u_achieve {
 };
 
 struct u_realtime {
-    long
-        realtime; /* actual playing time up until the last restore, seconds */
-    time_t restored; /* time the game was started or restored */
-    time_t endtime;
+    long   realtime;     /* accumulated playing time in seconds */
+    time_t start_timing; /* time game was started or restored or 'realtime'
+                            was last updated (savegamestate for checkpoint) */
+    time_t finish_time;  /* end of 'realtime' interval: time of save or
+                            end of game; used for topten/logfile/xlogfile */
 };
 
 /* KMH, conduct --

--- a/src/allmain.c
+++ b/src/allmain.c
@@ -587,18 +587,13 @@ newgame()
         com_pager(1);
     }
 
+    urealtime.realtime = 0L;
+    urealtime.start_timing = getnow();
 #ifdef INSURANCE
     save_currentstate();
 #endif
     program_state.something_worth_saving++; /* useful data now exists */
 
-    urealtime.realtime = 0L;
-#if defined(BSD) && !defined(POSIX_TYPES)
-    (void) time((long *) &urealtime.restored);
-#else
-    (void) time(&urealtime.restored);
-#endif
-
     /* Success! */
     welcome(TRUE);
     return;

--- a/src/end.c
+++ b/src/end.c
@@ -951,8 +951,8 @@ int how;
     /* remember time of death here instead of having bones, rip, and
        topten figure it out separately and possibly getting different
        time or even day if player is slow responding to --More-- */
-    endtime = getnow();
-    urealtime.realtime += (long) (endtime - urealtime.restored);
+    urealtime.finish_time = endtime = getnow();
+    urealtime.realtime += (long) (endtime - urealtime.start_timing);
 
     /* Sometimes you die on the first move.  Life's not fair.
      * On those rare occasions you get hosed immediately, go out

--- a/src/restore.c
+++ b/src/restore.c
@@ -568,13 +568,10 @@ unsigned int *stuckid, *steedid;
     foo = time_from_yyyymmddhhmmss(timebuf);
 
     ReadTimebuf(ubirthday);
-    mread(fd, &urealtime.realtime, sizeof(urealtime.realtime));
-    ReadTimebuf(urealtime.restored);
-#if defined(BSD) && !defined(POSIX_TYPES)
-    (void) time((long *) &urealtime.restored);
-#else
-    (void) time(&urealtime.restored);
-#endif
+    mread(fd, &urealtime.realtime, sizeof urealtime.realtime);
+    ReadTimebuf(urealtime.start_timing); /** [not used] **/
+    /* current time is the time to use for next urealtime.realtime update */
+    urealtime.start_timing = getnow();
 
     set_uasmon();
 #ifdef CLIPPING

--- a/src/save.c
+++ b/src/save.c
@@ -289,12 +289,15 @@ register int fd, mode;
 #ifdef SYSFLAGS
     bwrite(fd, (genericptr_t) &sysflags, sizeof(struct sysflag));
 #endif
-    urealtime.realtime += (long) (getnow() - urealtime.restored);
+    urealtime.finish_time = getnow();
+    urealtime.realtime += (long) (urealtime.finish_time
+                                  - urealtime.start_timing);
     bwrite(fd, (genericptr_t) &u, sizeof(struct you));
     bwrite(fd, yyyymmddhhmmss(ubirthday), 14);
-    bwrite(fd, (genericptr_t) &urealtime.realtime,
-           sizeof(urealtime.realtime));
-    bwrite(fd, yyyymmddhhmmss(urealtime.restored), 14);
+    bwrite(fd, (genericptr_t) &urealtime.realtime, sizeof urealtime.realtime);
+    bwrite(fd, yyyymmddhhmmss(urealtime.start_timing), 14);  /** Why? **/
+    /* this is the value to use for the next update of urealtime.realtime */
+    urealtime.start_timing = urealtime.finish_time;
     save_killers(fd, mode);
 
     /* must come before migrating_objs and migrating_mons are freed */

--- a/src/topten.c
+++ b/src/topten.c
@@ -330,8 +330,8 @@ struct toptenentry *tt;
     Fprintf(rfile, "%cconduct=0x%lx%cturns=%ld%cachieve=0x%lx", XLOG_SEP,
             encodeconduct(), XLOG_SEP, moves, XLOG_SEP, encodeachieve());
     Fprintf(rfile, "%crealtime=%ld%cstarttime=%ld%cendtime=%ld", XLOG_SEP,
-            (long) urealtime.realtime, XLOG_SEP, (long) ubirthday, XLOG_SEP,
-            (long) urealtime.endtime);
+            (long) urealtime.realtime, XLOG_SEP,
+            (long) ubirthday, XLOG_SEP, (long) urealtime.finish_time);
     Fprintf(rfile, "%cgender0=%s%calign0=%s", XLOG_SEP,
             genders[flags.initgend].filecode, XLOG_SEP,
             aligns[1 - u.ualignbase[A_ORIGINAL]].filecode);
@@ -516,7 +516,6 @@ time_t when;
     t0->birthdate = yyyymmdd(ubirthday);
     t0->deathdate = yyyymmdd(when);
     t0->tt_next = 0;
-    urealtime.endtime = when;
 #ifdef UPDATE_RECORD_IN_PLACE
     t0->fpos = -1L;
 #endif