--- deliantra/server/include/define.h	2007/11/08 19:43:24	1.77
+++ deliantra/server/include/define.h	2008/04/22 07:01:46	1.80
@@ -44,25 +44,12 @@
 #ifdef __NetBSD__
 # include <sys/param.h>
 #endif
-#ifndef MIN
-# define MIN(x,y) min (x, y)
-#endif
-#ifndef MAX
-# define MAX(x,y) max (x, y)
-#endif
 
 // maximum length of an object name in the protocol
 #define NAME_LEN 127
 
-/* MAX3 is basically like MAX, but instead does 3 values. */
-#ifndef MAX3
-# define MAX3(x,y, z) (MAX(x, MAX(y,z)))
-#endif
-
-/* MIN3 is basically like MIN, but instead does 3 values. */
-#ifndef MIN3
-# define MIN3(x,y, z) (MIN(x, MIN(y,z)))
-#endif
+#undef MIN
+#undef MAX
 
 #define MAX_STAT		30      /* The maximum legal value of any stat */
 #define MIN_STAT		1       /* The minimum legal value of any stat */
@@ -314,8 +301,8 @@
 #define NUM_SUBTYPES    64
 
 /* Subtypes for BUILDER */
-#define ST_BD_BUILD     1       /* Builds an item */
-#define ST_BD_REMOVE    2     /* Removes an item */
+#define ST_BD_BUILD     1      /* Builds an item */
+#define ST_BD_REMOVE    2      /* Removes an item */
 
 /* Subtypes for MATERIAL */
 #define ST_MAT_FLOOR    1      /* Floor */
@@ -774,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