--- deliantra/server/include/define.h	2007/01/27 02:19:37	1.45
+++ deliantra/server/include/define.h	2007/04/21 16:56:32	1.51
@@ -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 */
@@ -286,7 +287,7 @@
  *                             and should perhaps be removed.
  *
  * Wed Dec 20 13:35:24 CET 2006:
- * elmex: haha, removed TRAP_PART, LIGHT_SOURCE, MONSTER and SPAWN_GENERATOR now.
+ * elmex: removed TRAP_PART, LIGHT_SOURCE, MONSTER and SPAWN_GENERATOR now.
  *        monsters are marked by FLAG_MONSTER and generator with FLAG_GENERATOR.
  *        renamed WALL to BUILDABLE_WALL.
  */
@@ -596,24 +597,16 @@
  * describe_item() so properly describe those types.
  * change_abil() probably should be updated also.
  */
-#define MOVE_WALK	0x1     /* Object walks */
-#define MOVE_FLY_LOW	0x2     /* Low flying object */
-#define MOVE_FLY_HIGH	0x4     /* High flying object */
-#define	MOVE_FLYING	0x6
+#define MOVE_WALK	0x01    /* Object walks */
+#define MOVE_FLY_LOW	0x02    /* Low flying object */
+#define MOVE_FLY_HIGH	0x04    /* High flying object */
+#define	MOVE_FLYING	0x06
                                 /* Combo of fly_low and fly_high */
-#define MOVE_SWIM	0x8     /* Swimming object */
+#define MOVE_SWIM	0x08    /* Swimming object */
 #define MOVE_BOAT	0x10    /* Boats/sailing */
-#define MOVE_ALL	0x1f    /* Mask of all movement types */
+#define MOVE_SHIP	0x20    /* boats suitable fro oceans */
 
-/* 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
+#define MOVE_ALL	0x3f    /* Mask of all movement types */
 
 /* typdef here to define type large enough to hold bitmask of
  * all movement types.  Make one declaration so easy to update.
@@ -770,10 +763,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