--- deliantra/server/include/define.h 2010/04/04 04:10:47 1.119 +++ deliantra/server/include/define.h 2010/04/04 04:58:46 1.120 @@ -69,12 +69,6 @@ #define ATTUNE_REPELL 16 // levels diff for attune/repell -//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 // unused -#define TOO_MANY_ERRORS 3 - /* TYPE DEFINES */ /* Only add new values to this list if somewhere in the program code, @@ -593,8 +587,8 @@ * practical reason to exceed this */ #define LOS_MAX 4 /* max. los value for non-blocked spaces */ #define LOS_BLOCKED 100 /* fully blocked spaces */ -#define BRIGHTNESS(xyz) (xyz)->glow_radius>MAX_LIGHT_RADII? \ - MAX_LIGHT_RADII:(xyz)->glow_radius; +#define BRIGHTNESS(xyz) (xyz)->glow_radius>MAX_LIGHT_RADII ? \ + MAX_LIGHT_RADII : (xyz)->glow_radius; // player position in blocked_los code #define LOS_X0 (MAP_CLIENT_X / 2 - 1) #define LOS_Y0 (MAP_CLIENT_Y / 2 - 1) @@ -698,6 +692,7 @@ #define PREFER_LOW 0 /* Flags for apply_special() */ +GENCONST_IV(AP_) enum apply_flag { /* Basic flags/mode, always use one of these */