--- deliantra/server/include/define.h 2007/05/17 14:14:55 1.57 +++ deliantra/server/include/define.h 2007/05/19 00:08:11 1.59 @@ -276,6 +276,8 @@ #define SAFE_GROUND 165 /* This is a safe ground, means that neither bombs, potions, alchemy, or magic works here (elmex) */ +#define NUM_TYPES 166 // must be max(type) + 1 + /* DEAD TYPES: */ //#define FBULLET 10 //#define FBALL 11 @@ -870,18 +872,18 @@ /* Flags for apply_special() */ enum apply_flag { - /* Basic flags, always use one of these */ - AP_NULL = 0, - AP_APPLY = 1, + /* Basic flags/mode, always use one of these */ + AP_TOGGLE = 0, + AP_APPLY = 1, AP_UNAPPLY = 2, - AP_BASIC_FLAGS = 15, + AP_BASIC_FLAGS = 0x0f, /* Optional flags, for bitwise or with a basic flag */ - AP_NO_MERGE = 16, - AP_IGNORE_CURSE = 32, - AP_PRINT = 64 /* Print what to do, don't actually do it */ - /* Note this is supported in all the functions */ + AP_NO_MERGE = 0x10, + AP_IGNORE_CURSE = 0x20, + AP_PRINT = 0x40, /* Print what to do, don't actually do it */ + AP_NO_READY = 0x80, // do not ready skill associated with skilltool. }; /* Bitmask values for 'can_apply_object()' return values.