--- deliantra/server/include/object.h 2006/12/23 06:30:49 1.65 +++ deliantra/server/include/object.h 2006/12/23 06:41:39 1.66 @@ -190,7 +190,7 @@ /* this objects turns into or what this object creates */ treasurelist *ACC (RW, randomitems); /* Items to be generated */ key_value *key_values; /* Fields not explictly known by the loader. */ - flags_t flags; /* various flags */ + flags_t flag; /* various flags */ uint16 ACC (RW, animation_id);/* An index into the animation array */ uint8 ACC (RW, anim_speed); /* ticks between animation-frames */ uint8 ACC (RW, last_anim); /* last sequence used to draw face */ @@ -292,9 +292,9 @@ || type == CLOAK || type == BOOTS || type == GLOVES || type == BRACERS || type == GIRDLE; } bool is_alive () const { return (type == PLAYER - || flags [FLAG_MONSTER] - || (flags [FLAG_ALIVE] && !flags [FLAG_GENERATOR] && type != DOOR)) - && !flags [FLAG_IS_A_TEMPLATE]; } + || flag [FLAG_MONSTER] + || (flag [FLAG_ALIVE] && !flag [FLAG_GENERATOR] && type != DOOR)) + && !flag [FLAG_IS_A_TEMPLATE]; } bool is_arrow () const { return type == ARROW || (type == SPELL_EFFECT && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } @@ -302,7 +302,7 @@ /* This return true if object has still randomitems which * could be expanded. */ - bool has_random_items () const { return randomitems && !flags [FLAG_IS_A_TEMPLATE]; } + bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; } // returns the player that has this object in his inventory, or 0 object *in_player () const