--- deliantra/server/include/object.h 2006/12/22 16:34:00 1.62 +++ deliantra/server/include/object.h 2006/12/22 16:54:56 1.63 @@ -154,6 +154,8 @@ // these are being copied and also cleared struct object_pod { + typedef bitset flags_t; + New_Face *ACC (RW, face); /* Face with colors */ sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */ float ACC (RW, speed); /* The overall speed of this object */ @@ -226,7 +228,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. */ - std::bitset flags; /* various flags */ + object_pod::flags_t flags; /* 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 */ @@ -245,6 +247,7 @@ struct object : zero_initialised, object_keep, object_copy, object_pod { + typedef object_pod::flags_t flags_t; typedef unordered_vector vector; static vector mortals;