--- deliantra/server/include/define.h 2007/04/15 14:15:15 1.49 +++ deliantra/server/include/define.h 2007/05/03 09:26:45 1.53 @@ -287,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. */ @@ -446,7 +446,7 @@ #define FLAG_IS_THROWN 17 /* Object is designed to be thrown. */ #define FLAG_AUTO_APPLY 18 /* Will be applied when created */ - // not used anywhere in the code // #define FLAG_TREASURE 19 /* Will generate treasure when applied */ +#define FLAG_TREASURE_ENV 19 // put treasure into environment not in inventory #define FLAG_PLAYER_SOLD 20 /* Object was sold to a shop by a player. */ #define FLAG_SEE_INVISIBLE 21 /* Will see invisible player */ #define FLAG_CAN_ROLL 22 /* Object can be rolled */ @@ -506,7 +506,7 @@ /* (Monster) can wield weapons */ #define FLAG_USE_RING 58 /* (Monster) can use rings, boots, gauntlets, etc */ #define FLAG_READY_RANGE 59 /* (Monster) has a range attack readied... 8) */ -#define FLAG_READY_BOW 60 /* not implemented yet */ +#define FLAG_READY_BOW 60 /* (Monster) has valid bow readied */ #define FLAG_XRAYS 61 /* X-ray vision */ #define FLAG_NO_APPLY 62 /* Avoids step_on/fly_on to this object */ #define FLAG_IS_FLOOR 63 /* Can't see what's underneath this object */ @@ -533,7 +533,7 @@ #define FLAG_READY_SCROLL 81 /* monster has scroll in inv and can use it */ #define FLAG_USE_ROD 82 /* (Monster) can apply and use rods */ -/*#define FLAG_READY_HORN 83 unused (Monster) has a horn readied */ +#define FLAG_PRECIOUS 83 // object is precious (pets) #define FLAG_USE_HORN 84 /* (Monster) can apply and use horns */ #define FLAG_MAKE_INVIS 85 /* (Item) gives invisibility when applied */ @@ -597,14 +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 */ + +#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.