--- deliantra/server/include/global.h 2007/03/18 03:05:40 1.49 +++ deliantra/server/include/global.h 2009/10/15 21:59:48 1.79 @@ -1,31 +1,31 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 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. + * Deliantra is free software: you can redistribute it and/or modify it under + * the terms of the Affero GNU General Public License as published by the + * Free Software Foundation, either version 3 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 + * 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 author can be reached via e-mail to crossfire@schmorp.de + * You should have received a copy of the Affero GNU General Public License + * and the GNU General Public License along with this program. If not, see + * . + * + * The authors can be reached via e-mail to */ #ifndef GLOBAL_H #define GLOBAL_H -#define _GLIBCXX_CONCEPT_CHECKS +//#define _GLIBCXX_CONCEPT_CHECKS #ifndef EXTERN #define EXTERN extern @@ -45,20 +45,33 @@ #define FALSE 0 #endif +extern short freearr_x[SIZEOFFREE], freearr_y[SIZEOFFREE]; +extern int maxfree[SIZEOFFREE], freedir[SIZEOFFREE]; +extern int rightof_x[9], rightof_y[9]; +extern int leftof_x[9], leftof_y[9]; + // used only for tagging structure members so scripting languages // can easily parse the include files. #define INTERFACE_CLASS(name) #define ACC(meta,member) member #define MTH +#if __GNUC__ >= 3 +# define attribute(attrlist) __attribute__(attrlist) +#else +# define attribute(attrlist) +#endif + #include "keyword.h" #include "traits.h" #include "dynbuf.h" #include "util.h" #include "shstr.h" +#include "cfperl.h" /* This blob, in this order, is needed to actually define maps */ #include "face.h" +#include "sounds.h" #include "spells.h" @@ -66,6 +79,7 @@ #include "material.h" #include "living.h" #include "object.h" +#include "region.h" #include "map.h" #include "tod.h" @@ -107,8 +121,6 @@ /* Now for recipe/alchemy */ #include "recipe.h" -#include "funcpoint.h" - /***************************************************************************** * GLOBAL VARIABLES: * *****************************************************************************/ @@ -116,9 +128,7 @@ /* * These are the beginnings of linked lists: */ -EXTERN treasurelist *first_treasurelist; EXTERN artifactlist *first_artifactlist; -EXTERN archetype *first_archetype; EXTERN objectlink *first_friendly_object; /* Objects monsters will go after */ EXTERN godlink *first_god; EXTERN racelink *first_race; @@ -127,62 +137,34 @@ * Variables set by different flags (see init.c): */ -EXTERN bool warn_archetypes; /* If true, write warnings when failing */ - /* to find archetypes when loading from file */ EXTERN bool init_done; /* Ignores signals until init_done is true */ EXTERN bool in_cleanup; /* True when cleanup() is reached */ -extern long pticks; /* used by various function to determine */ +extern tick_t pticks; /* used by various function to determine */ /* how often to save the character */ /* * Misc global variables: */ -EXTERN FILE *logfile; /* Used by server/daemon.c */ -EXTERN int exiting; /* True if the game is about to exit */ -EXTERN long nroftreasures; /* Only used in malloc_info() */ -EXTERN long nrofartifacts; /* Only used in malloc_info() */ -EXTERN long nrofallowedstr; /* Only used in malloc_info() */ - -EXTERN archetype *empty_archetype; /* Nice to have fast access to it */ -EXTERN archetype *map_archeytpe; 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; -/* - * Used in treasure.c - */ -EXTERN archetype *ring_arch, *amulet_arch, *staff_arch, *crown_arch; -EXTERN std::vector animations; -EXTERN int num_animations, animations_allocated; -EXTERN uint32_t bmaps_checksum; - -#define SET_ANIMATION(ob,newanim) ob->face = animations [ob->animation_id].faces [newanim] -#define GET_ANIMATION(ob,anim) animations [ob->animation_id].faces [anim] -#define GET_ANIM_ID(ob) (ob->animation_id) -/* NUM_ANIMATIONS returns the number of animations allocated. The last - * usuable animation will be NUM_ANIMATIONS-1 (for example, if an object - * has 8 animations, NUM_ANIMATIONS will return 8, but the values will - * range from 0 through 7. - */ -#define NUM_ANIMATIONS(ob) (animations[ob->animation_id].num_animations) -#define NUM_FACINGS(ob) (animations[ob->animation_id].facings) +extern dynbuf_text msg_dynbuf; // a dynbuf for text messages and other temporary data -extern short freearr_x[SIZEOFFREE], freearr_y[SIZEOFFREE]; -extern int maxfree[SIZEOFFREE], freedir[SIZEOFFREE]; -extern int rightof_x[9], rightof_y[9]; -extern int leftof_x[9], leftof_y[9]; +/* do not use these in new code, see object.h::animation */ +#define SET_ANIMATION(ob,frame) ob->set_anim_frame (frame) +#define NUM_ANIMATIONS(ob) (ob)->anim_frames () +#define NUM_FACINGS(ob) (ob)->anim_facings () + +// used only by treasure.C, does not handle null arch ptrs +#define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name) extern void emergency_save (); -extern void cleanup (const char *cause, bool make_core = false); #include "libproto.h" #include "sockproto.h" -#define decrease_ob(xyz) decrease_ob_nr(xyz,1) - INTERFACE_CLASS (Settings) struct Settings { const char *ACC (RO, logfilename); /* logfile to use */ @@ -218,23 +200,10 @@ uint8 ACC (RW, spell_encumbrance); /* encumbrance effects spells */ uint8 ACC (RW, spell_failure_effects); /* nasty backlash to spell failures */ 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 dummy_001; + uint8 dummy_002; 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 */ - const char *ACC (RO, rules); /* name of rules file*/ - const char *ACC (RO, news); /* name of news file*/ - char ACC (RW, dm_mail)[MAX_BUF]; /* DM's Email address */ - - uint32 ACC (RW, worldmapstartx); /* starting x tile for the worldmap */ - uint32 ACC (RW, worldmapstarty); /* starting y tile for the worldmap */ - uint32 ACC (RW, worldmaptilesx); /* number of tiles wide the worldmap is */ - uint32 ACC (RW, worldmaptilesy); /* number of tiles high the worldmap is */ - uint32 ACC (RW, worldmaptilesizex); /* number of squares wide in a wm tile */ - uint32 ACC (RW, worldmaptilesizey); /* number of squares high in a wm tile */ - uint16 ACC (RW, dynamiclevel); /* how dynamic is the world? */ - uint8 ACC (RW, fastclock); /* if true, clock goes warp 9 */ int ACC (RW, max_level); /* This is read out of exp_table */ float ACC (RW, item_power_factor); /* See note in setings file */ @@ -244,14 +213,15 @@ int ACC (RW, armor_speed_improvement); /* Speed improvement */ uint8 ACC (RW, armor_weight_linear); /* If 1, weight reduction is linear, else exponantiel */ uint8 ACC (RW, armor_speed_linear); /* If 1, speed improvement is linear, else exponantiel */ - uint8 ACC (RW, no_player_stealing); /* If 1, can not steal from other players */ - uint8 ACC (RW, create_home_portals); /* If 1, can create portals in personal maps */ }; extern Settings settings; -#include "plugin.h" -#include "cfperl.h" +void reset_signals (); + +#ifdef DEVEL +# include "devel.h" +#endif #endif /* GLOBAL_H */