--- deliantra/server/include/tod.h	2007/01/15 21:06:19	1.7
+++ deliantra/server/include/tod.h	2007/04/17 10:06:33	1.9
@@ -23,41 +23,46 @@
  * The authors can be reached via e-mail at crossfire@schmorp.de
  */
 
-#ifndef _TOD_H_
-#define _TOD_H_
+#ifndef TOD_H_
+#define TOD_H_
 
-#define PTICKS_PER_CLOCK	1500
+#define TICK                    (MAX_TIME * 1e-6)
+
+#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 */
@@ -132,5 +137,7 @@
         int elevmax; /* elevation min/max */
         int season; /* 0=any or 1-5 */
 } weather_grow_t;
+#endif
+
+#endif
 
-#endif /* _TOD_H_ */