--- deliantra/server/include/define.h 2008/04/22 07:01:46 1.80 +++ deliantra/server/include/define.h 2008/08/31 02:01:41 1.85 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2003-2005,2007 Mark Wedel & Crossfire Development Team * Copyright (©) 1992,2007 Frank Tore Johansen * @@ -383,9 +383,11 @@ * 2 spaces, and the entire array (< SIZEOFFREE) is * three spaces */ -#define SIZEOFFREE1 8 +#define SIZEOFFREE0 0 +#define SIZEOFFREE1 8 #define SIZEOFFREE2 24 -#define SIZEOFFREE 49 +#define SIZEOFFREE3 48 +#define SIZEOFFREE 49 #define NROF_SOUNDS (23 + NROFREALSPELLS) /* Number of sounds */ @@ -522,11 +524,11 @@ #define FLAG_ONE_HIT 97 /* Monster can only hit once before going * away (replaces ghosthit) */ -#define FLAG_CLIENT_SENT 98 /* THIS IS A DEBUG FLAG ONLY. We use it to - * detect cases were the server is trying - * to send an upditem when we have not - * actually sent the item. - */ +//#define FLAG_CLIENT_SENT 98 /* THIS IS A DEBUG FLAG ONLY. We use it to +// * detect cases were the server is trying +// * to send an upditem when we have not +// * actually sent the item. +// */ #define FLAG_BERSERK 99 /* monster will attack closest living object */ @@ -588,8 +590,6 @@ #define OB_TYPE_MOVE_BLOCK(ob1, type) \ ((type) && (ob1->move_type & type) == ob1->move_type) -#define SET_GENERATE_TYPE(xyz,va) (xyz)->stats.sp=(va) -#define GENERATE_TYPE(xyz) ((xyz)->stats.sp) #define GENERATE_SPEED(xyz) ((xyz)->stats.maxsp) /* if(!RANDOM()%) */ #define EXIT_PATH(xyz) (xyz)->slaying