| … | |
… | |
| 152 | }; |
152 | }; |
| 153 | |
153 | |
| 154 | // these are being copied and also cleared |
154 | // these are being copied and also cleared |
| 155 | struct object_pod |
155 | struct object_pod |
| 156 | { |
156 | { |
|
|
157 | typedef bitset<NUM_FLAGS> flags_t; |
|
|
158 | |
| 157 | New_Face *ACC (RW, face); /* Face with colors */ |
159 | New_Face *ACC (RW, face); /* Face with colors */ |
| 158 | sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */ |
160 | sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */ |
| 159 | float ACC (RW, speed); /* The overall speed of this object */ |
161 | float ACC (RW, speed); /* The overall speed of this object */ |
| 160 | float ACC (RW, speed_left); /* How much speed is left to spend this round */ |
162 | float ACC (RW, speed_left); /* How much speed is left to spend this round */ |
| 161 | uint32 ACC (RW, nrof); /* How many of the objects */ |
163 | uint32 ACC (RW, nrof); /* How many of the objects */ |
| … | |
… | |
| 224 | |
226 | |
| 225 | /* Following are values used by any object */ |
227 | /* Following are values used by any object */ |
| 226 | /* this objects turns into or what this object creates */ |
228 | /* this objects turns into or what this object creates */ |
| 227 | treasurelist *ACC (RW, randomitems); /* Items to be generated */ |
229 | treasurelist *ACC (RW, randomitems); /* Items to be generated */ |
| 228 | key_value *key_values; /* Fields not explictly known by the loader. */ |
230 | key_value *key_values; /* Fields not explictly known by the loader. */ |
| 229 | std::bitset<NUM_FLAGS> flags; /* various flags */ |
231 | object_pod::flags_t flags; /* various flags */ |
| 230 | uint16 ACC (RW, animation_id);/* An index into the animation array */ |
232 | uint16 ACC (RW, animation_id);/* An index into the animation array */ |
| 231 | uint8 ACC (RW, anim_speed); /* ticks between animation-frames */ |
233 | uint8 ACC (RW, anim_speed); /* ticks between animation-frames */ |
| 232 | uint8 ACC (RW, last_anim); /* last sequence used to draw face */ |
234 | uint8 ACC (RW, last_anim); /* last sequence used to draw face */ |
| 233 | sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */ |
235 | sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */ |
| 234 | uint8 ACC (RW, smoothlevel); /* how to smooth this square around */ |
236 | uint8 ACC (RW, smoothlevel); /* how to smooth this square around */ |
| … | |
… | |
| 243 | float ACC (RW, move_slow_penalty); /* How much this slows down the object */ |
245 | float ACC (RW, move_slow_penalty); /* How much this slows down the object */ |
| 244 | }; |
246 | }; |
| 245 | |
247 | |
| 246 | struct object : zero_initialised, object_keep, object_copy, object_pod |
248 | struct object : zero_initialised, object_keep, object_copy, object_pod |
| 247 | { |
249 | { |
|
|
250 | typedef object_pod::flags_t flags_t; |
| 248 | typedef unordered_vector<object *> vector; |
251 | typedef unordered_vector<object *> vector; |
| 249 | |
252 | |
| 250 | static vector mortals; |
253 | static vector mortals; |
| 251 | static vector active; // active objects, not yet used |
254 | static vector active; // active objects, not yet used |
| 252 | static vector objects; // not used yet, use first->next->... |
255 | static vector objects; // not used yet, use first->next->... |
