--- deliantra/server/include/global.h 2007/04/25 18:47:50 1.56 +++ deliantra/server/include/global.h 2007/05/17 14:14:55 1.59 @@ -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 @@ -51,6 +51,12 @@ #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" @@ -208,8 +214,8 @@ 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 */ @@ -234,12 +240,12 @@ 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; +void reset_signals (); + #include "plugin.h" #include "cfperl.h"