--- deliantra/server/include/global.h 2010/03/26 00:59:21 1.84 +++ deliantra/server/include/global.h 2010/04/29 12:24:04 1.89 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * 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 * @@ -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" @@ -70,7 +73,7 @@ #include "spells.h" #include "attack.h" /* needs to be before material.h */ -#include "material.h" +#include "material.h" /* needs to be before freezethaw.h */ #include "living.h" #include "object.h" #include "region.h" @@ -89,8 +92,6 @@ /* pull in treasure structure */ #include "treasure.h" -#include "commands.h" - /* pull in book structures */ #include "book.h" /*