--- deliantra/server/common/time.C	2006/08/24 13:13:48	1.3
+++ deliantra/server/common/time.C	2006/09/14 22:34:00	1.5
@@ -1,9 +1,4 @@
 /*
- * static char *rcsid_time_c =
- *    "$Id: time.C,v 1.3 2006/08/24 13:13:48 root Exp $";
- */
-
-/*
     CrossFire, A Multiplayer game for X-windows
 
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -23,17 +18,17 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 #include <global.h>
 #include <funcpoint.h>
 #include <tod.h>
 
-#ifndef WIN32 /* ---win32 exclude header */
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/time.h>
+#ifndef WIN32                   /* ---win32 exclude header */
+# include <stdio.h>
+# include <sys/types.h>
+# include <sys/time.h>
 #endif /* win32 */
 
 /*
@@ -43,60 +38,59 @@
 long psaveind;
 long pticks;
 
-const char *season_name[] =
-{
-        "The Season of New Year",
-        "The Season of Growth",
-        "The Season of Harvest",
-        "The Season of Decay",
-        "The Season of the Blizzard",
-        "\n"
+const char *season_name[] = {
+  "The Season of New Year",
+  "The Season of Growth",
+  "The Season of Harvest",
+  "The Season of Decay",
+  "The Season of the Blizzard",
+  "\n"
 };
 
 const char *weekdays[DAYS_PER_WEEK] = {
-   "the Day of the Moon",
-   "the Day of the Bull",
-   "the Day of the Deception",
-   "the Day of Thunder",
-   "the Day of Freedom",
-   "the Day of the Great Gods",
-   "the Day of the Sun"
+  "the Day of the Moon",
+  "the Day of the Bull",
+  "the Day of the Deception",
+  "the Day of Thunder",
+  "the Day of Freedom",
+  "the Day of the Great Gods",
+  "the Day of the Sun"
 };
 
 const char *month_name[MONTHS_PER_YEAR] = {
-   "Month of Winter",           /* 0 */
-   "Month of the Ice Dragon",
-   "Month of the Frost Giant",
-   "Month of Valriel",
-   "Month of Lythander",
-   "Month of the Harvest",
-   "Month of Gaea",
-   "Month of Futility",
-   "Month of the Dragon",
-   "Month of the Sun",
-   "Month of the Great Infernus",
-   "Month of Ruggilli",
-   "Month of the Dark Shades",
-   "Month of the Devourers",
-   "Month of Sorig",
-   "Month of the Ancient Darkness",
-   "Month of Gorokh"
+  "Month of Winter",            /* 0 */
+  "Month of the Ice Dragon",
+  "Month of the Frost Giant",
+  "Month of Valriel",
+  "Month of Lythander",
+  "Month of the Harvest",
+  "Month of Gaea",
+  "Month of Futility",
+  "Month of the Dragon",
+  "Month of the Sun",
+  "Month of the Great Infernus",
+  "Month of Ruggilli",
+  "Month of the Dark Shades",
+  "Month of the Devourers",
+  "Month of Sorig",
+  "Month of the Ancient Darkness",
+  "Month of Gorokh"
 };
 
 extern unsigned long todtick;
 
 void
-get_tod(timeofday_t *tod)
+get_tod (timeofday_t * tod)
 {
-  tod->year = todtick/HOURS_PER_YEAR;
-  tod->month = (todtick/HOURS_PER_MONTH)%MONTHS_PER_YEAR;
-  tod->day = (todtick%HOURS_PER_MONTH)/DAYS_PER_MONTH;
-  tod->dayofweek = tod->day%DAYS_PER_WEEK;
-  tod->hour = todtick%HOURS_PER_DAY;
-  tod->minute = (pticks%PTICKS_PER_CLOCK)/(PTICKS_PER_CLOCK/58);
+  tod->year = todtick / HOURS_PER_YEAR;
+  tod->month = (todtick / HOURS_PER_MONTH) % MONTHS_PER_YEAR;
+  tod->day = (todtick % HOURS_PER_MONTH) / DAYS_PER_MONTH;
+  tod->dayofweek = tod->day % DAYS_PER_WEEK;
+  tod->hour = todtick % HOURS_PER_DAY;
+  tod->minute = (pticks % PTICKS_PER_CLOCK) / (PTICKS_PER_CLOCK / 58);
   if (tod->minute > 58)
-     tod->minute = 58; /* it's imprecise at best anyhow */
-  tod->weekofmonth = tod->day/WEEKS_PER_MONTH;
+    tod->minute = 58;           /* it's imprecise at best anyhow */
+  tod->weekofmonth = tod->day / WEEKS_PER_MONTH;
   if (tod->month < 3)
     tod->season = 0;
   else if (tod->month < 6)
@@ -110,19 +104,17 @@
 }
 
 void
-print_tod(object *op)
+print_tod (object *op)
 {
   timeofday_t tod;
   const char *suf;
   int day;
 
-  get_tod(&tod);
-  sprintf(errmsg, "It is %d minute%s past %d o'clock %s, on %s",
-    tod.minute+1, ((tod.minute+1 < 2) ? "" : "s"),
-    ((tod.hour % 14 == 0) ? 14 : ((tod.hour)%14)),
-    ((tod.hour >= 14) ? "pm" : "am"),
-    weekdays[tod.dayofweek]);
-  new_draw_info(NDI_UNIQUE, 0,op,errmsg);
+  get_tod (&tod);
+  sprintf (errmsg, "It is %d minute%s past %d o'clock %s, on %s",
+           tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
+           ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am"), weekdays[tod.dayofweek]);
+  new_draw_info (NDI_UNIQUE, 0, op, errmsg);
 
   day = tod.day + 1;
   if (day == 1 || ((day % 10) == 1 && day > 20))
@@ -133,19 +125,18 @@
     suf = "rd";
   else
     suf = "th";
-  sprintf(errmsg, "The %d%s Day of the %s, Year %d", day, suf,
-    month_name[tod.month], tod.year+1);
-  new_draw_info(NDI_UNIQUE, 0,op,errmsg);
+  sprintf (errmsg, "The %d%s Day of the %s, Year %d", day, suf, month_name[tod.month], tod.year + 1);
+  new_draw_info (NDI_UNIQUE, 0, op, errmsg);
 
-  sprintf(errmsg, "Time of Year: %s", season_name[tod.season]);
-  new_draw_info(NDI_UNIQUE, 0,op,errmsg);
+  sprintf (errmsg, "Time of Year: %s", season_name[tod.season]);
+  new_draw_info (NDI_UNIQUE, 0, op, errmsg);
 }
 
 long
-seconds(void)
+seconds (void)
 {
   struct timeval now;
 
-  (void) GETTIMEOFDAY(&now);
+  (void) GETTIMEOFDAY (&now);
   return now.tv_sec;
 }