ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/object.h
(Generate patch)

Comparing deliantra/server/include/object.h (file contents):
Revision 1.36 by root, Thu Sep 14 17:10:25 2006 UTC vs.
Revision 1.38 by root, Thu Sep 14 21:16:12 2006 UTC

… …
230 float ACC (RW, move_slow_penalty); /* How much this slows down the object */ 230 float ACC (RW, move_slow_penalty); /* How much this slows down the object */
231}; 231};
232 232
233struct object : zero_initialised, object_keep, object_copy, object_pod 233struct object : zero_initialised, object_keep, object_copy, object_pod
234{ 234{
235 typedef unordered_vector<object *> vector;
236
237 static vector mortals;
238 static vector active; // active objects, not yet used
239 static vector objects; // not used yet, use first->next->...
240 static object *first; // will be replaced by "objects"
241
235 static object *create (); 242 static object *create ();
236 void free (bool free_inventory = false); 243 void free (bool free_inventory = false);
237 244
238 static void free_mortals (); 245 static void free_mortals ();
239 static bool can_merge (object *op1, object *op2); 246 static bool can_merge (object *op1, object *op2);
… …
343struct archetype : zero_initialised 350struct archetype : zero_initialised
344{ 351{
345 archetype (); 352 archetype ();
346 ~archetype (); 353 ~archetype ();
347 354
355 static archetype *find (const char *arch);
356
348 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */ 357 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */
349 struct archetype *ACC (RW, next); /* Next archetype in a linked list */ 358 struct archetype *ACC (RW, next); /* Next archetype in a linked list */
350 struct archetype *ACC (RW, head); /* The main part of a linked object */ 359 struct archetype *ACC (RW, head); /* The main part of a linked object */
351 struct archetype *ACC (RW, more); /* Next part of a linked object */ 360 struct archetype *ACC (RW, more); /* Next part of a linked object */
352 object ACC (RO, clone); /* An object from which to do copy_object() */ 361 object ACC (RO, clone); /* An object from which to do copy_object() */
353 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */ 362 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
354 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is 363 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is
355 * in comparison to the head. 364 * in comparison to the head.
356 */ 365 */
357}; 366};
358 367
359extern object *objects; 368extern object *objects;
360extern object *active_objects; 369extern object *active_objects;
361 370

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines