--- deliantra/server/include/define.h 2006/12/21 23:37:05 1.30 +++ deliantra/server/include/define.h 2006/12/30 10:16:10 1.33 @@ -423,9 +423,9 @@ */ /* Basic routines to do above */ -#define SET_FLAG(obj, flag) (obj)->flags[flag] = 1 -#define CLEAR_FLAG(obj, flag) (obj)->flags[flag] = 0 -#define QUERY_FLAG(obj, flag) (obj)->flags[flag] +#define SET_FLAG(obj, flg) (obj)->flag [flg] = 1 +#define CLEAR_FLAG(obj, flg) (obj)->flag [flg] = 0 +#define QUERY_FLAG(obj, flg) (obj)->flag [flg] /* the flags */ @@ -581,6 +581,8 @@ #define FLAG_NEUTRAL 100 /* monster is from type neutral */ #define FLAG_NO_ATTACK 101 /* monster don't attack */ #define FLAG_NO_DAMAGE 102 /* monster can't be damaged */ + +//TODO schmorp: removed in rewrite, not yet readded #define FLAG_OBJ_ORIGINAL 103 /* NEVER SET THIS. Item was loaded by * load_original_map() */ #define FLAG_OBJ_SAVE_ON_OVL 104 /* this object should be saved on @@ -592,9 +594,9 @@ #define FLAG_CONTENT_ON_GEN 108 #define FLAG_IS_A_TEMPLATE 109 /* Object has no ingame life until instanciated */ #define FLAG_IS_BUILDABLE 110 /* Can build on item */ -#define FLAG_AFK 111 /* Player is AFK */ + #define NUM_FLAGS 111 /* Should always be equal to the last - * defined flag. If you change this, + * defined flag + 1. If you change this, * make sure you update the flag_links * in common/loader.l */