--- deliantra/server/include/global.h 2010/01/16 13:41:37 1.82 +++ deliantra/server/include/global.h 2010/04/15 04:56:47 1.88 @@ -1,9 +1,9 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * 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 + * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen * * 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 @@ -31,10 +31,18 @@ #define EXTERN extern #endif +// 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 +#define GENCONST_IV(patterns) + #include "includes.h" #include "config.h" #include "compiler.h" #include "define.h" +#include "traits.h" #ifndef TRUE #define TRUE 1 @@ -49,14 +57,9 @@ 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 +extern sint64 levels [MAXNUMLEVELS]; #include "keyword.h" -#include "traits.h" #include "logger.h" #include "dynbuf.h" #include "util.h" @@ -89,8 +92,6 @@ /* pull in treasure structure */ #include "treasure.h" -#include "commands.h" - /* pull in book structures */ #include "book.h" /* @@ -178,7 +179,7 @@ const char *ACC (RO, regions); /* name of the regions file - libdir is prepended */ const char *ACC (RO, treasures); /* location of the treasures file. */ const char *ACC (RO, uniquedir); /* directory for the unique items */ - const char *ACC (RO, templatedir); /* directory for the template map */ + const char *templatedir; /* directory for the template map */ const char *ACC (RO, tmpdir); /* Directory to use for temporary files */ sint16 ACC (RW, pk_luck_penalty); /* Amount by which player luck is reduced if they PK */ uint8 ACC (RW, stat_loss_on_death); /* If true, chars lose a random stat when they die */