--- deliantra/server/common/init.C 2006/09/13 02:05:18 1.11 +++ deliantra/server/common/init.C 2007/03/14 00:04:58 1.29 @@ -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-devel@real-time.com -*/ + * 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 @@ -32,12 +33,6 @@ # undef def }; -extern const keyword resist_save[NROFATTACKS] = { -# define def(uc, lc, name, plus, change) KW_resist_ ## lc, -# include "attackinc.h" -# undef def -}; - extern const char *const resist_plus[NROFATTACKS] = { # define def(uc, lc, name, plus, change) # plus, # include "attackinc.h" @@ -87,7 +82,6 @@ BALANCED_STAT_LOSS, NOT_PERMADETH, SIMPLE_EXP, - RESET_LOCATION_TIME, SET_TITLE, RESURRECTION, SEARCH_ITEMS, @@ -95,23 +89,14 @@ SPELL_FAILURE_EFFECTS, CASTING_TIME, REAL_WIZ, - RECYCLE_TMP_MAPS, EXPLORE_MODE, SPELLPOINT_LEVEL_DEPEND, SET_FRIENDLY_FIRE, - "", /* Who format specifier */ - "", /* who wiz format specifier */ MOTD, "rules", "news", "", /* DM_MAIL */ - 0, /* This and the next 3 values are metaserver values */ - "", - "", - 0, - "", 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */ - EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y, 0, 1.0, @@ -152,56 +137,6 @@ "Light" }; - -/* This loads the emergency map information from a - * .emergency file in the map directory. Doing this makes - * it easier to switch between map distributions (don't need - * to recompile. Note that there is no reason I see that - * this could not be re-loaded during play, but it seems - * like there should be little reason to do that. - */ -static void -init_emergency_mappath (void) -{ - char filename[MAX_BUF], tmpbuf[MAX_BUF]; - FILE *fp; - int online = 0; - - /* If this file doesn't exist, not a big deal */ - sprintf (filename, "%s/%s/.emergency", settings.datadir, settings.mapdir); - if ((fp = fopen (filename, "r")) != NULL) - { - while (fgets (tmpbuf, MAX_BUF - 1, fp)) - { - if (tmpbuf[0] == '#') - continue; /* ignore comments */ - - if (online == 0) - { - tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */ - settings.emergency_mapname = strdup_local (tmpbuf); - } - else if (online == 1) - { - settings.emergency_x = atoi (tmpbuf); - } - - else if (online == 2) - { - settings.emergency_y = atoi (tmpbuf); - } - online++; - if (online > 2) - break; - } - fclose (fp); - if (online <= 2) - LOG (llevError, "Online read partial data from %s\n", filename); - LOG (llevDebug, "Emergency mappath reset to %s (%d, %d)\n", settings.emergency_mapname, settings.emergency_x, settings.emergency_y); - } -} - - /* * It is vital that init_library() is called by any functions * using this library. @@ -210,28 +145,21 @@ * init_function_pointers(). Good idea to also call init_vars and * init_hash_table if you are doing any object loading. */ - void init_library (void) { - init_environ (); init_globals (); - init_objects (); - init_vars (); init_block (); - ReadBmapNames (); - ReadSmooth (); init_anim (); /* Must be after we read in the bitmaps */ init_archetypes (); /* Reads all archetypes from file */ init_dynamic (); init_attackmess (); init_clocks (); - init_emergency_mappath (); init_experience (); } -/* init_environ initializes values from the environmental variables. +/* init_environ initialises values from the environmental variables. * it needs to be called very early, since command line options should * overwrite these if specified. */ @@ -269,76 +197,24 @@ settings.tmpdir = cp; } - /* * Initialises all global variables. * Might use environment-variables as default for some of them. */ - void init_globals (void) { if (settings.logfilename[0] == 0) - { - logfile = stderr; - } + logfile = stderr; else if ((logfile = fopen (settings.logfilename, "a")) == NULL) { fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename); logfile = stderr; } else - { - setvbuf (logfile, NULL, _IOLBF, 0); - } - exiting = 0; - first_player = NULL; - first_friendly_object = NULL; - first_map = NULL; - first_treasurelist = NULL; - first_artifactlist = NULL; - first_archetype = NULL; - *first_map_ext_path = 0; - warn_archetypes = 0; - nroftreasures = 0; - nrofartifacts = 0; - nrofallowedstr = 0; - ring_arch = NULL; - amulet_arch = NULL; - staff_arch = NULL; - trying_emergency_save = 0; - num_animations = 0; - animations_allocated = 0; - init_defaults (); -} - -/* - * Sets up and initialises the linked list of free and used objects. - * Allocates a certain chunk of objects and puts them on the free list. - * Called by init_library(); - */ - -void -init_objects (void) -{ - /* Initialize all objects: */ - objects = NULL; - active_objects = NULL; -} - -/* - * Initialises global variables which can be changed by options. - * Called by init_library(). - */ - -void -init_defaults (void) -{ - editor = 0; - nroferrors = 0; + setvbuf (logfile, NULL, _IOLBF, 0); } - void init_dynamic (void) { @@ -349,17 +225,18 @@ if (at->clone.type == MAP) { if (at->clone.race) - { - strcpy (first_map_ext_path, at->clone.race); - } + first_map_ext_path = at->clone.race; + if (EXIT_PATH (&at->clone)) { - strcpy (first_map_path, EXIT_PATH (&at->clone)); + first_map_path = EXIT_PATH (&at->clone); return; } } + at = at->next; } + LOG (llevDebug, "You Need a archetype called 'map' and it have to contain start map\n"); exit (-1); } @@ -370,7 +247,6 @@ * Write out the current time to the file so time does not * reset every time the server reboots. */ - void write_todclock (void) { @@ -388,10 +264,9 @@ } /* - * Initializes the gametime and TOD counters + * initialises the gametime and TOD counters * Called by init_library(). */ - void init_clocks (void) { @@ -405,7 +280,7 @@ has_been_done = 1; sprintf (filename, "%s/clockdata", settings.localdir); - LOG (llevDebug, "Reading clockdata from %s...", filename); + LOG (llevDebug, "Reading clockdata from %s...\n", filename); if ((fp = fopen (filename, "r")) == NULL) { LOG (llevError, "Can't open %s.\n", filename); @@ -413,13 +288,14 @@ write_todclock (); return; } + fscanf (fp, "%lu", &todtick); LOG (llevDebug, "todtick=%lu\n", todtick); fclose (fp); } /* - * Initializes the attack messages. + * initialises the attack messages. * Called by init_library(). */ @@ -442,7 +318,7 @@ has_been_done = 1; sprintf (filename, "%s/attackmess", settings.datadir); - LOG (llevDebug, "Reading attack messages from %s...", filename); + LOG (llevDebug, "Reading attack messages from %s...\n", filename); if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL) { LOG (llevError, "Can't open %s.\n", filename); @@ -482,9 +358,9 @@ attack_mess[mess][level].level = atoi (buf); p = strtok (NULL, "="); if (p != NULL) - attack_mess[mess][level].buf1 = strdup_local (p); + attack_mess[mess][level].buf1 = strdup (p); else - attack_mess[mess][level].buf1 = strdup_local (""); + attack_mess[mess][level].buf1 = strdup (""); mode = 2; continue; } @@ -494,9 +370,9 @@ attack_mess[mess][level].level = atoi (buf); p = strtok (NULL, "="); if (p != NULL) - attack_mess[mess][level].buf2 = strdup_local (p); + attack_mess[mess][level].buf2 = strdup (p); else - attack_mess[mess][level].buf2 = strdup_local (""); + attack_mess[mess][level].buf2 = strdup (""); mode = 3; continue; } @@ -506,9 +382,9 @@ attack_mess[mess][level].level = atoi (buf); p = strtok (NULL, "="); if (p != NULL) - attack_mess[mess][level].buf3 = strdup_local (p); + attack_mess[mess][level].buf3 = strdup (p); else - attack_mess[mess][level].buf3 = strdup_local (""); + attack_mess[mess][level].buf3 = strdup (""); mode = 1; level++; total++;