--- deliantra/server/include/tod.h	2006/12/15 20:07:02	1.4
+++ deliantra/server/include/tod.h	2007/04/17 10:06:33	1.9
@@ -1,62 +1,68 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2003-2006 Mark Wedel & Crossfire Development Team
-    Copyright (C) 2000 Tim Rightnour 
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2003-2006 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 2000 Tim Rightnour 
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * 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@schmorp.de
+ */
 
-    The authors can be reached via e-mail at crossfire.de
-*/
+#ifndef TOD_H_
+#define TOD_H_
 
-#ifndef _TOD_H_
-#define _TOD_H_
+#define TICK                    (MAX_TIME * 1e-6)
 
-#define PTICKS_PER_CLOCK	1500
+#define RUNTIME_PER_HOUR	180.
+#define TICKS_PER_HOUR		int (RUNTIME_PER_HOUR / MAX_TIME * 1e6)
 
 /* game time */
 #define HOURS_PER_DAY		28
-#define DAYS_PER_WEEK		7
-#define WEEKS_PER_MONTH		5
+#define DAYS_PER_WEEK		 7
+#define WEEKS_PER_MONTH		 5
 #define MONTHS_PER_YEAR		17
 
 /* convenience */
-#define WEEKS_PER_YEAR		(WEEKS_PER_MONTH*MONTHS_PER_YEAR)
-#define DAYS_PER_MONTH		(DAYS_PER_WEEK*WEEKS_PER_MONTH)
-#define DAYS_PER_YEAR		(DAYS_PER_MONTH*MONTHS_PER_YEAR)
-#define HOURS_PER_WEEK		(HOURS_PER_DAY*DAYS_PER_WEEK)
-#define HOURS_PER_MONTH		(HOURS_PER_WEEK*WEEKS_PER_MONTH)
-#define HOURS_PER_YEAR		(HOURS_PER_MONTH*MONTHS_PER_YEAR)
+#define WEEKS_PER_YEAR		(WEEKS_PER_MONTH * MONTHS_PER_YEAR)
+#define DAYS_PER_MONTH		(DAYS_PER_WEEK   * WEEKS_PER_MONTH)
+#define DAYS_PER_YEAR		(DAYS_PER_MONTH  * MONTHS_PER_YEAR)
+#define HOURS_PER_WEEK		(HOURS_PER_DAY   * DAYS_PER_WEEK)
+#define HOURS_PER_MONTH		(HOURS_PER_WEEK  * WEEKS_PER_MONTH)
+#define HOURS_PER_YEAR		(HOURS_PER_MONTH * MONTHS_PER_YEAR)
 
 #define LUNAR_DAYS		DAYS_PER_MONTH
 
-typedef struct _timeofday {
-        int year;
-        int month;
-        int day;
-        int dayofweek;
-        int hour;
-        int minute;
-        int weekofmonth;
-        int season;
-} timeofday_t;
+struct timeofday_t
+{
+  int year;
+  int month;
+  int day;
+  int dayofweek;
+  int hour;
+  int minute;
+  int weekofmonth;
+  int season;
+};
 
 /* from common/time.c */
-extern void get_tod(timeofday_t *tod);
+extern void get_tod (timeofday_t *tod);
 
+#if 0
 /* weather stuff */
 
 #define POLAR_BASE_TEMP		0	/* C */
@@ -131,5 +137,7 @@
         int elevmax; /* elevation min/max */
         int season; /* 0=any or 1-5 */
 } weather_grow_t;
+#endif
+
+#endif
 
-#endif /* _TOD_H_ */