--- deliantra/server/include/object.h 2006/09/08 16:51:44 1.20 +++ deliantra/server/include/object.h 2006/09/08 16:53:57 1.21 @@ -215,8 +215,8 @@ uint8 ACC (RW, range_modifier); /* How going up in level effects range */ /* Following are values used by any object */ - struct archt *ACC (RW, arch); /* Pointer to archetype */ - struct archt *ACC (RW, other_arch); /* Pointer used for various things - mostly used for what */ + struct archetype *ACC (RW, arch); /* Pointer to archetype */ + struct archetype *ACC (RW, other_arch); /* Pointer used for various things - mostly used for what */ /* this objects turns into or what this object creates */ uint32 flags[4]; /* various flags */ uint16 ACC (RW, animation_id); /* An index into the animation array */ @@ -269,18 +269,18 @@ */ ACC_CLASS(archetype) -struct archt : zero_initialised +struct archetype : zero_initialised { shstr ACC (RW, name); /* More definite name, like "generate_kobold" */ - struct archt *ACC (RW, next); /* Next archetype in a linked list */ - struct archt *ACC (RW, head); /* The main part of a linked object */ - struct archt *ACC (RW, more); /* Next part of a linked object */ + struct archetype *ACC (RW, next); /* Next archetype in a linked list */ + struct archetype *ACC (RW, head); /* The main part of a linked object */ + struct archetype *ACC (RW, more); /* Next part of a linked object */ object ACC (RO, clone); /* An object from which to do copy_object() */ uint32 ACC (RW, editable); /* editable flags (mainly for editor) */ sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is * in comparison to the head. */ -} archetype; +}; extern object *objects; extern object *active_objects;