[crawl-ref-commits] SF.net SVN: crawl-ref:[6733] branches/stone_soup-0.4/crawl-ref/source

[<dsh...@us...>]

Revision: 6733
          http://crawl-ref.svn.sourceforge.net/crawl-ref/?rev=6733&view=rev
Author:   dshaligram
Date:     2008-07-30 12:40:26 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
When DGAMELAUNCH is defined, use gmtime() instead of localtime() so it's easier to keep multiple dgl servers in sync.

Modified Paths:
--------------
    branches/stone_soup-0.4/crawl-ref/source/AppHdr.h
    branches/stone_soup-0.4/crawl-ref/source/debug.cc
    branches/stone_soup-0.4/crawl-ref/source/hiscores.cc
    branches/stone_soup-0.4/crawl-ref/source/ouch.cc
    branches/stone_soup-0.4/crawl-ref/source/tags.cc

Modified: branches/stone_soup-0.4/crawl-ref/source/AppHdr.h
===================================================================
--- branches/stone_soup-0.4/crawl-ref/source/AppHdr.h	2008-07-30 10:53:06 UTC (rev 6732)
+++ branches/stone_soup-0.4/crawl-ref/source/AppHdr.h	2008-07-30 12:40:26 UTC (rev 6733)
@@ -271,8 +271,15 @@
     // Makes the game ask the user to hit Enter after bailing out with
     // an error message.
     #define DGL_PAUSE_AFTER_ERROR
+
+    // Use UTC for dgamelaunch servers.
+    #define TIME_FN gmtime
 #endif
 
+#ifndef TIME_FN
+#define TIME_FN localtime
+#endif
+
 #if defined(REGEX_POSIX) && defined(REGEX_PCRE)
 #error You can use either REGEX_POSIX or REGEX_PCRE, or neither, but not both.
 #endif

Modified: branches/stone_soup-0.4/crawl-ref/source/debug.cc
===================================================================
--- branches/stone_soup-0.4/crawl-ref/source/debug.cc	2008-07-30 10:53:06 UTC (rev 6732)
+++ branches/stone_soup-0.4/crawl-ref/source/debug.cc	2008-07-30 12:40:26 UTC (rev 6733)
@@ -3134,7 +3134,7 @@
 static std::string _fsim_time_string()
 {
     time_t curr_time = time(NULL);
-    struct tm *ltime = localtime(&curr_time);
+    struct tm *ltime = TIME_FN(&curr_time);
     if (ltime)
     {
         char buf[100];

Modified: branches/stone_soup-0.4/crawl-ref/source/hiscores.cc
===================================================================
--- branches/stone_soup-0.4/crawl-ref/source/hiscores.cc	2008-07-30 10:53:06 UTC (rev 6732)
+++ branches/stone_soup-0.4/crawl-ref/source/hiscores.cc	2008-07-30 12:40:26 UTC (rev 6733)
@@ -327,19 +327,19 @@
 
 static bool _hiscore_same_day( time_t t1, time_t t2 )
 {
-    struct tm *d1  = localtime( &t1 );
+    struct tm *d1  = TIME_FN( &t1 );
     const int year = d1->tm_year;
     const int mon  = d1->tm_mon;
     const int day  = d1->tm_mday;
 
-    struct tm *d2  = localtime( &t2 );
+    struct tm *d2  = TIME_FN( &t2 );
 
     return (d2->tm_mday == day && d2->tm_mon == mon && d2->tm_year == year);
 }
 
 static void _hiscore_date_string( time_t time, char buff[INFO_SIZE] )
 {
-    struct tm *date = localtime( &time );
+    struct tm *date = TIME_FN( &time );
 
     const char *mons[12] = { "Jan", "Feb", "Mar", "Apr", "May", "June",
                              "July", "Aug", "Sept", "Oct", "Nov", "Dec" };

Modified: branches/stone_soup-0.4/crawl-ref/source/ouch.cc
===================================================================
--- branches/stone_soup-0.4/crawl-ref/source/ouch.cc	2008-07-30 10:53:06 UTC (rev 6732)
+++ branches/stone_soup-0.4/crawl-ref/source/ouch.cc	2008-07-30 12:40:26 UTC (rev 6733)
@@ -955,7 +955,7 @@
 #else  // !SHORT_FILE_NAMES
     std::string name = "morgue-" + std::string(you.your_name);
 
-    if (tm *loc = localtime(&when_crawl_got_even))
+    if (tm *loc = TIME_FN(&when_crawl_got_even))
     {
         char buf[25];
         snprintf(buf, sizeof buf, "-%04d%02d%02d-%02d%02d%02d",

Modified: branches/stone_soup-0.4/crawl-ref/source/tags.cc
===================================================================
--- branches/stone_soup-0.4/crawl-ref/source/tags.cc	2008-07-30 10:53:06 UTC (rev 6732)
+++ branches/stone_soup-0.4/crawl-ref/source/tags.cc	2008-07-30 12:40:26 UTC (rev 6733)
@@ -584,7 +584,7 @@
         return (buff);
     }
 
-    struct tm *date = localtime( &in_date );
+    struct tm *date = TIME_FN( &in_date );
 
     snprintf( buff, sizeof buff,
               "%4d%02d%02d%02d%02d%02d%s",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.