--- deliantra/server/common/init.C 2007/01/03 00:21:35 1.21 +++ deliantra/server/common/init.C 2007/03/11 02:12:44 1.28 @@ -1,25 +1,26 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - 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, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002 Mark Wedel & Crossfire Development Team + * 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 + */ #define EXTERN // horrible hack @@ -81,7 +82,6 @@ BALANCED_STAT_LOSS, NOT_PERMADETH, SIMPLE_EXP, - RESET_LOCATION_TIME, SET_TITLE, RESURRECTION, SEARCH_ITEMS, @@ -148,11 +148,8 @@ void init_library (void) { - init_environ (); init_globals (); - init_vars (); init_block (); - ReadBmapNames (); ReadSmooth (); init_anim (); /* Must be after we read in the bitmaps */ init_archetypes (); /* Reads all archetypes from file */ @@ -201,12 +198,10 @@ settings.tmpdir = cp; } - /* * Initialises all global variables. * Might use environment-variables as default for some of them. */ - void init_globals (void) { @@ -253,7 +248,6 @@ * Write out the current time to the file so time does not * reset every time the server reboots. */ - void write_todclock (void) { @@ -274,7 +268,6 @@ * initialises the gametime and TOD counters * Called by init_library(). */ - void init_clocks (void) { @@ -296,6 +289,7 @@ write_todclock (); return; } + fscanf (fp, "%lu", &todtick); LOG (llevDebug, "todtick=%lu\n", todtick); fclose (fp);