--- deliantra/server/include/define.h	2008/04/13 20:21:50	1.79
+++ deliantra/server/include/define.h	2008/08/27 03:41:24	1.84
@@ -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 */
 
@@ -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()%<speed>) */
 
 #define EXIT_PATH(xyz)		(xyz)->slaying
@@ -761,12 +761,6 @@
 
 #define RANDOM() (rndm.next () & 0xffffffU)
 
-/* Returns the weight of the given object. Note: it does not take the number of
- * items (nrof) into account.
- * (this looks rather bogus, schmorp)
- */
-#define WEIGHT(op) ((op)->nrof ? (op)->weight : (op)->weight + (op)->carrying)
-
 /*
  * Warning!
  * If you add message types here, don't forget