--- deliantra/server/common/time.C 2007/03/17 22:32:15 1.11 +++ deliantra/server/common/time.C 2007/05/17 21:32:08 1.14 @@ -1,5 +1,5 @@ /* - * CrossFire, A Multiplayer game for X-windows + * CrossFire, A Multiplayer game * * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team * Copyright (C) 2002 Mark Wedel & Crossfire Development Team @@ -34,7 +34,7 @@ /* * Gloabal variables: */ -long pticks; +tick_t pticks; static const char *season_name[5] = { "New Year", @@ -77,13 +77,13 @@ void get_tod (timeofday_t * tod) { - unsigned int todtick = runtime * (1. / RUNTIME_PER_HOUR); + unsigned int todtick = (unsigned int)(runtime * (1. / RUNTIME_PER_HOUR)); 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->hour = todtick % HOURS_PER_DAY; - tod->minute = (runtime - todtick * RUNTIME_PER_HOUR) * (60. / RUNTIME_PER_HOUR); + tod->minute = (int)((runtime - todtick * RUNTIME_PER_HOUR) * (60. / RUNTIME_PER_HOUR)); tod->dayofweek = tod->day % DAYS_PER_WEEK; tod->weekofmonth = tod->day / WEEKS_PER_MONTH;