--- deliantra/server/include/global.h 2006/12/30 10:16:10 1.33 +++ deliantra/server/include/global.h 2007/01/07 02:39:14 1.38 @@ -1,6 +1,7 @@ /* 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 @@ -125,12 +126,6 @@ EXTERN racelink *first_race; /* - * The editor uses these (will get them out of here later): - */ - -EXTERN long editor; /* if true, edit maps instead of playing (almost obsolete) */ - -/* * Variables set by different flags (see init.c): */ @@ -152,8 +147,8 @@ EXTERN archetype *empty_archetype; /* Nice to have fast access to it */ EXTERN archetype *map_archeytpe; -EXTERN char first_map_path[MAX_BUF]; /* The start-level */ -EXTERN char first_map_ext_path[MAX_BUF]; /* Path used for per-race start maps */ +EXTERN shstr first_map_path; /* The start-level */ +EXTERN shstr first_map_ext_path; /* Path used for per-race start maps */ EXTERN char errmsg[HUGE_BUF]; EXTERN long ob_count; @@ -191,7 +186,7 @@ extern client *init_sockets; extern void emergency_save (); -extern void cleanup (bool make_core = false); +extern void cleanup (const char *cause, bool make_core = false); #include "libproto.h" #include "sockproto.h" @@ -236,7 +231,7 @@ uint16 ACC (RW, set_friendly_fire); /* Percent of damage done by peaceful player vs player damage */ uint8 ACC (RW, casting_time); /* it takes awhile to cast a spell */ uint8 ACC (RW, real_wiz); /* use mud-like wizards */ - uint8 ACC (RW, explore_mode); /* explore mode allowed? */ + uint8 dummy_000; uint8 ACC (RW, spellpoint_level_depend); /* spell costs go up with level */ char ACC (RW, motd)[MAX_BUF]; /* name of the motd file */ char *ACC (RO, rules); /* name of rules file*/