--- deliantra/server/include/define.h	2007/01/20 22:09:52	1.44
+++ deliantra/server/include/define.h	2007/04/15 14:15:15	1.49
@@ -84,9 +84,10 @@
 #define MAX_EXT_TITLE 98
 
 /* Fatal variables: */
+//TODO: remove all calls to fatal and replace them by cleanup
 #define OUT_OF_MEMORY		0
 #define MAP_ERROR		1
-#define ARCHTABLE_TOO_SMALL	2
+#define ARCHTABLE_TOO_SMALL	2 // unused
 #define TOO_MANY_ERRORS		3
 
 /* TYPE DEFINES */
@@ -605,16 +606,6 @@
 #define MOVE_BOAT	0x10    /* Boats/sailing */
 #define MOVE_ALL	0x1f    /* Mask of all movement types */
 
-/* the normal assumption is that objects are walking/flying.
- * So often we don't want to block movement, but still don't want
- * to allow all types (swimming is rather specialized) - I also
- * expect as more movement types show up, this is likely to get
- * updated.  Basically, this is the default for spaces that allow
- * movement - anything but swimming right now.  If you really
- * want nothing at all, then can always set move_block to 0
- */
-#define MOVE_BLOCK_DEFAULT  MOVE_SWIM
-
 /* typdef here to define type large enough to hold bitmask of
  * all movement types.  Make one declaration so easy to update.
  * uint8 is defined yet, so just use what that would define it
@@ -770,10 +761,6 @@
 
 #define BLANK_FACE_NAME "blank.x11"
 #define EMPTY_FACE_NAME "empty.x11"
-#define DARK_FACE1_NAME		"dark1.x11"
-#define DARK_FACE2_NAME		"dark2.x11"
-#define DARK_FACE3_NAME		"dark3.x11"
-#define SMOOTH_FACE_NAME	"default_smoothed.111"
 
 /*
  * Defines for the luck/random functions to make things more readable
@@ -923,20 +910,8 @@
 /* Cut off point of when an object is put on the active list or not */
 #define MIN_ACTIVE_SPEED	1e-5
 
-/*
- * random() is much better than rand().  If you have random(), use it instead.
- * You shouldn't need to change any of this
- *
- * 0.93.3: It looks like linux has random (previously, it was set below
- * to use rand).  Perhaps old version of linux lack rand?  IF you run into
- * problems, add || defined(__linux__) the #if immediately below.
- *
- * 0.94.2 - you probably shouldn't need to change any of the rand stuff
- * here.
- */
-
-#define RANDOM() (rndm.next () & 0x7fffffffU)
-#define SRANDOM(xyz) //TODO, get rid of
+#define RANDOM() (rndm.next () & 0xffffffU)
+#define SRANDOM(xyz) rndm.seed (xyz) //TODO, get rid of
 
 /* Returns the weight of the given object. Note: it does not take the number of
  * items (nrof) into account.