Merge branch 'master' into win32-x64-working

This commit is contained in:
nhmall
2015-04-17 06:34:48 -04:00
6 changed files with 7 additions and 7 deletions

View File

@@ -14,7 +14,7 @@
* Incrementing EDITLEVEL can be used to force invalidation of old bones
* and save files.
*/
#define EDITLEVEL 61
#define EDITLEVEL 62
#define COPYRIGHT_BANNER_A \
"NetHack, Copyright 1985-2015"

View File

@@ -67,7 +67,7 @@ struct u_achieve {
};
struct u_realtime {
time_t realtime; /* actual playing time up until the last restore */
long realtime; /* actual playing time up until the last restore, seconds */
time_t restored; /* time the game was started or restored */
time_t endtime;
};