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.30 by root, Tue Sep 12 01:09:53 2006 UTC vs.
Revision 1.54 by root, Fri Dec 15 20:07:02 2006 UTC

… …
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 20
21 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at crossfire.de
22*/ 22*/
23 23
24#ifndef OBJECT_H 24#ifndef OBJECT_H
25#define OBJECT_H 25#define OBJECT_H
26 26
… …
56{ 56{
57 key_value *next; 57 key_value *next;
58 shstr key, value; 58 shstr key, value;
59}; 59};
60 60
61struct UUID
62{
63 uint64 seq;
64
65 UUID () { }
66 UUID (uint64 seq) : seq(seq) { }
67 operator uint64() { return seq; }
68 void operator =(uint64 seq) { this->seq = seq; }
69};
70
71extern void init_uuid ();
72extern UUID gen_uuid ();
73extern const uint64 UUID_SKIP;
61 74
62/* Definition for WILL_APPLY values. Replaces having harcoded values 75/* Definition for WILL_APPLY values. Replaces having harcoded values
63 * sprinkled in the code. Note that some of these also replace fields 76 * sprinkled in the code. Note that some of these also replace fields
64 * that were in the can_apply area. What is the point of having both 77 * that were in the can_apply area. What is the point of having both
65 * can_apply and will_apply? 78 * can_apply and will_apply?
… …
68#define WILL_APPLY_TREASURE 0x02 81#define WILL_APPLY_TREASURE 0x02
69#define WILL_APPLY_EARTHWALL 0x04 82#define WILL_APPLY_EARTHWALL 0x04
70#define WILL_APPLY_DOOR 0x08 83#define WILL_APPLY_DOOR 0x08
71#define WILL_APPLY_FOOD 0x10 84#define WILL_APPLY_FOOD 0x10
72 85
73
74/* However, if you're keeping a pointer of some sort, you probably 86/* However, if you're keeping a pointer of some sort, you probably
75 * don't just want it copied, so you'll need to add to common/object.C, 87 * don't just want it copied, so you'll need to add to common/object.C,
76 * e.g. copy_object. 88 * e.g. ->copy_to ()
77 */ 89 */
90
91typedef refptr<object> object_ptr;
92typedef refptr<archetype> arch_ptr;
78 93
79// these are not being copied 94// these are not being copied
80ACC_CLASS (object) 95ACC_CLASS (object)
81struct object_keep : refcounted 96struct object_keep : refcounted
82{ 97{
83 tag_t ACC (RW, count); /* Unique object number for this object */
84
85 /* These variables are not changed by copy_object() */ 98 /* These variables are not changed by ->copy_to */
99
100 tag_t ACC (RW, count); /* Generation count for this object */
101 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
102
86 struct pl *ACC (RW, contr); /* Pointer to the player which control this object */ 103 player *ACC (RW, contr); /* Pointer to the player which control this object */
87 struct object *ACC (RW, next); /* Pointer to the next object in the free/used list */ 104 object *ACC (RW, next); /* Pointer to the next object in the free/used list */
88 struct object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */ 105 object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */
89 struct object *ACC (RW, active_next); /* Next & previous object in the 'active' */ 106 object *ACC (RW, active_next);/* Next & previous object in the 'active' */
90 struct object *ACC (RW, active_prev); /* List. This is used in process_events */ 107 object *ACC (RW, active_prev);/* List. This is used in process_events */
91 /* so that the entire object list does not */ 108 /* so that the entire object list does not */
92 /* need to be gone through. */ 109 /* need to be gone through. */
93 struct object *ACC (RW, below); /* Pointer to the object stacked below this one */ 110 object *ACC (RW, below); /* Pointer to the object stacked below this one */
94 struct object *ACC (RW, above); /* Pointer to the object stacked above this one */ 111 object *ACC (RW, above); /* Pointer to the object stacked above this one */
95 /* Note: stacked in the *same* environment */ 112 /* Note: stacked in the *same* environment */
96 struct object *inv; /* Pointer to the first object in the inventory */ 113 object *inv; /* Pointer to the first object in the inventory */
97 struct object *ACC (RW, container); /* Current container being used. I think this 114 object *ACC (RW, container); /* Current container being used. I think this
98 * is only used by the player right now. 115 * is only used by the player right now.
99 */ 116 */
100 struct object *ACC (RW, env); /* Pointer to the object which is the environment. 117 object *ACC (RW, env); /* Pointer to the object which is the environment.
101 * This is typically the container that the object is in. 118 * This is typically the container that the object is in.
102 */ 119 */
103 struct object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ 120 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
104 struct object *ACC (RW, head); /* Points to the main object of a large body */ 121 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
105 struct mapstruct *ACC (RW, map); /* Pointer to the map in which this object is present */ 122 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */
106}; 123};
107 124
108// these are being copied 125// these are being copied
109struct object_copy : attachable<object> 126struct object_copy : attachable<object>
110{ 127{
111 refptr<object> ACC (RW, owner); /* Pointer to the object which controls this one */
112 shstr ACC (RW, name); /* The name of the object, obviously... */ 128 shstr ACC (RW, name); /* The name of the object, obviously... */
113 shstr ACC (RW, name_pl); /* The plural name of the object */ 129 shstr ACC (RW, name_pl); /* The plural name of the object */
114 shstr ACC (RW, title); /* Of foo, etc */ 130 shstr ACC (RW, title); /* Of foo, etc */
115 shstr ACC (RW, race); /* human, goblin, dragon, etc */ 131 shstr ACC (RW, race); /* human, goblin, dragon, etc */
116 shstr ACC (RW, slaying); /* Which race to do double damage to */ 132 shstr ACC (RW, slaying); /* Which race to do double damage to */
117 /* If this is an exit, this is the filename */ 133 /* If this is an exit, this is the filename */
118 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */ 134 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
119 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */ 135 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
120 shstr ACC (RW, lore); /* Obscure information about this object, */ 136 shstr ACC (RW, lore); /* Obscure information about this object, */
121 /* To get put into books and the like. */ 137 /* To get put into books and the like. */
122 shstr ACC (RW, materialname); /* specific material name */ 138 shstr ACC (RW, materialname); /* specific material name */
123 shstr ACC (RW, custom_name); /* Custom name assigned by player */ 139 shstr ACC (RW, custom_name); /* Custom name assigned by player */
140 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */
141 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */
142 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
143 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
144 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
145 object_ptr ACC (RW, spell); /* Spell that was being cast */
146 object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */
124}; 147};
125 148
126// these are being copied and also cleared 149// these are being copied and also cleared
127struct object_pod 150struct object_pod
128{ 151{
152 New_Face *ACC (RW, face); /* Face with colors */
129 sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */ 153 sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
130 float ACC (RW, speed); /* The overall speed of this object */ 154 float ACC (RW, speed); /* The overall speed of this object */
131 float ACC (RW, speed_left); /* How much speed is left to spend this round */ 155 float ACC (RW, speed_left); /* How much speed is left to spend this round */
132 uint32 ACC (RW, nrof); /* How many of the objects */ 156 uint32 ACC (RW, nrof); /* How many of the objects */
133 New_Face *ACC (RW, face); /* Face with colors */
134 sint8 ACC (RW, direction); /* Means the object is moving that way. */ 157 sint8 ACC (RW, direction); /* Means the object is moving that way. */
135 sint8 ACC (RW, facing); /* Object is oriented/facing that way. */ 158 sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
136 159
137 /* This next big block are basically used for monsters and equipment */ 160 /* This next big block are basically used for monsters and equipment */
138 uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */ 161 uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */
139 uint8 ACC (RW, subtype); /* subtype of object */ 162 uint8 ACC (RW, subtype); /* subtype of object */
140 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */ 163 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */
141 sint16 resist[NROFATTACKS]; /* Resistance adjustments for attacks */ 164 sint16 resist[NROFATTACKS]; /* Resistance adjustments for attacks */
142 uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */ 165 uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */
143 uint32 ACC (RW, path_attuned); /* Paths the object is attuned to */ 166 uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */
144 uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */ 167 uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */
145 uint32 ACC (RW, path_denied); /* Paths the object is denied access to */ 168 uint32 ACC (RW, path_denied); /* Paths the object is denied access to */
146 uint16 ACC (RW, material); /* What materials this object consist of */ 169 uint16 ACC (RW, material); /* What materials this object consist of */
147 sint8 ACC (RW, magic); /* Any magical bonuses to this item */ 170 sint8 ACC (RW, magic); /* Any magical bonuses to this item */
148 uint8 ACC (RW, state); /* How the object was last drawn (animation) */ 171 uint8 ACC (RW, state); /* How the object was last drawn (animation) */
149 sint32 ACC (RW, value); /* How much money it is worth (or contains) */ 172 sint32 ACC (RW, value); /* How much money it is worth (or contains) */
150 /* Note that the last_.. values are sometimes used for non obvious 173 /* Note that the last_.. values are sometimes used for non obvious
151 * meanings by some objects, eg, sp penalty, permanent exp. 174 * meanings by some objects, eg, sp penalty, permanent exp.
152 */ 175 */
153 sint32 ACC (RW, last_heal); /* Last healed. Depends on constitution */ 176 sint32 ACC (RW, last_heal); /* Last healed. Depends on constitution */
… …
156 sint16 ACC (RW, last_eat); /* How long since we last ate */ 179 sint16 ACC (RW, last_eat); /* How long since we last ate */
157 sint16 ACC (RW, invisible); /* How much longer the object will be invis */ 180 sint16 ACC (RW, invisible); /* How much longer the object will be invis */
158 sint16 ACC (RW, level); /* Level of creature or object */ 181 sint16 ACC (RW, level); /* Level of creature or object */
159 uint8 ACC (RW, pick_up); /* See crossfire.doc */ 182 uint8 ACC (RW, pick_up); /* See crossfire.doc */
160 sint8 ACC (RW, item_power); /* power rating of the object */ 183 sint8 ACC (RW, item_power); /* power rating of the object */
161 sint8 ACC (RW, gen_sp_armour); /* sp regen penalty this object has (was last_heal) */ 184 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */
162 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */ 185 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */
163 sint32 ACC (RW, weight); /* Attributes of the object */ 186 sint32 ACC (RW, weight); /* Attributes of the object */
164 sint32 ACC (RW, weight_limit); /* Weight-limit of object */ 187 sint32 ACC (RW, weight_limit);/* Weight-limit of object */
165 sint32 ACC (RW, carrying); /* How much weight this object contains */ 188 sint32 ACC (RW, carrying); /* How much weight this object contains */
166 living ACC (RO, stats); /* Str, Con, Dex, etc */
167 sint64 ACC (RW, perm_exp); /* Permanent exp */ 189 sint64 ACC (RW, perm_exp); /* Permanent exp */
168 struct object *ACC (RW, current_weapon); /* Pointer to the weapon currently used */
169 uint32 ACC (RW, weapontype); /* type of weapon */ 190 uint32 ACC (RW, weapontype); /* type of weapon */
170 uint32 ACC (RW, tooltype); /* type of tool or build facility */ 191 uint32 ACC (RW, tooltype); /* type of tool or build facility */
171 sint8 body_info[NUM_BODY_LOCATIONS]; /* body info as loaded from the file */ 192 sint8 body_info[NUM_BODY_LOCATIONS]; /* body info as loaded from the file */
172 sint8 body_used[NUM_BODY_LOCATIONS]; /* Calculated value based on items equipped */ 193 sint8 body_used[NUM_BODY_LOCATIONS]; /* Calculated value based on items equipped */
173 uint8 ACC (RW, will_apply); /* See crossfire.doc */ 194 living ACC (RO, stats); /* Str, Con, Dex, etc */
174 /* See the doc/Developers/objects for more info about body locations */ 195 /* See the doc/Developers/objects for more info about body locations */
175 196
176 /* Following mostly refers to fields only used for monsters */ 197 /* Following mostly refers to fields only used for monsters */
177 tag_t ACC (RW, ownercount); /* What count the owner had (in case owner has been freed) *///TODO: remove/fix
178 struct object *ACC (RW, enemy); /* Monster/player to follow even if not closest */
179 struct object *ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
180 tag_t ACC (RW, attacked_by_count); /* the tag of attacker, so we can be sure */
181 struct treasureliststruct *ACC (RW, randomitems); /* Items to be generated */
182 struct object *ACC (RW, chosen_skill); /* the skill chosen to use */
183 uint32 ACC (RW, hide); /* The object is hidden, not invisible */ 198 uint32 ACC (RW, hide); /* The object is hidden, not invisible */
184 /* changes made by kholland@sunlab.cit.cornell.edu */ 199 /* changes made by kholland@sunlab.cit.cornell.edu */
185 /* allows different movement patterns for attackers */ 200 /* allows different movement patterns for attackers */
186 sint32 ACC (RW, move_status); /* What stage in attack mode */ 201 sint32 ACC (RW, move_status); /* What stage in attack mode */
187 uint16 ACC (RW, attack_movement); /* What kind of attack movement */ 202 uint16 ACC (RW, attack_movement); /* What kind of attack movement */
188 uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */ 203 uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
189 struct object *ACC (RW, spellitem); /* Spell ability monster is choosing to use */
190 float ACC (RW, expmul); /* needed experience = (calc_exp*expmul) - means some */ 204 float ACC (RW, expmul); /* needed experience = (calc_exp*expmul) - means some */
191 /* races/classes can need less/more exp to gain levels */ 205 /* races/classes can need less/more exp to gain levels */
192 206
193 /* Spell related information, may be useful elsewhere 207 /* Spell related information, may be useful elsewhere
194 * Note that other fields are used - these files are basically 208 * Note that other fields are used - these files are basically
195 * only used in spells. 209 * only used in spells.
196 */ 210 */
197 sint16 ACC (RW, duration); /* How long the spell lasts */ 211 sint16 ACC (RW, duration); /* How long the spell lasts */
198 sint16 ACC (RW, casting_time); /* time left before spell goes off */ 212 sint16 ACC (RW, casting_time);/* time left before spell goes off */
199 uint16 ACC (RW, start_holding); 213 uint16 ACC (RW, start_holding);
200 struct object *ACC (RW, spell); /* Spell that was being cast */
201 char *ACC (RW, spellarg);
202 uint8 ACC (RW, duration_modifier); /* how level modifies duration */ 214 uint8 ACC (RW, duration_modifier); /* how level modifies duration */
203 uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */ 215 uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */
204 sint8 ACC (RW, range); /* Range of the spell */ 216 sint8 ACC (RW, range); /* Range of the spell */
205 uint8 ACC (RW, range_modifier); /* How going up in level effects range */ 217 uint8 ACC (RW, range_modifier); /* How going up in level effects range */
218 char *ACC (RW, spellarg);
206 219
207 /* Following are values used by any object */ 220 /* Following are values used by any object */
208 struct archetype *ACC (RW, arch); /* Pointer to archetype */ 221 treasurelist *ACC (RW, randomitems); /* Items to be generated */
222 arch_ptr ACC (RW, arch); /* Pointer to archetype */
209 struct archetype *ACC (RW, other_arch); /* Pointer used for various things - mostly used for what */ 223 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
224 key_value *key_values; /* Fields not explictly known by the loader. */
210 /* this objects turns into or what this object creates */ 225 /* this objects turns into or what this object creates */
211 uint32 flags[4]; /* various flags */ 226 uint32 flags[4]; /* various flags */
212 uint16 ACC (RW, animation_id); /* An index into the animation array */ 227 uint16 ACC (RW, animation_id);/* An index into the animation array */
213 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */ 228 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
214 uint8 ACC (RW, last_anim); /* last sequence used to draw face */ 229 uint8 ACC (RW, last_anim); /* last sequence used to draw face */
215 sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */ 230 sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */
216 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */ 231 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
232 uint8 ACC (RW, will_apply); /* See crossfire.doc */
217 233
218 MoveType ACC (RW, move_type); /* Type of movement this object uses */ 234 MoveType ACC (RW, move_type); /* Type of movement this object uses */
219 MoveType ACC (RW, move_block); /* What movement types this blocks */ 235 MoveType ACC (RW, move_block);/* What movement types this blocks */
220 MoveType ACC (RW, move_allow); /* What movement types explicitly allowd */ 236 MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */
221 MoveType ACC (RW, move_on); /* Move types affected moving on to this space */ 237 MoveType ACC (RW, move_on); /* Move types affected moving on to this space */
222 MoveType ACC (RW, move_off); /* Move types affected moving off this space */ 238 MoveType ACC (RW, move_off); /* Move types affected moving off this space */
223 MoveType ACC (RW, move_slow); /* Movement types this slows down */ 239 MoveType ACC (RW, move_slow); /* Movement types this slows down */
224 float ACC (RW, move_slow_penalty); /* How much this slows down the object */ 240 float ACC (RW, move_slow_penalty); /* How much this slows down the object */
225 key_value *key_values; /* Fields not explictly known by the loader. */
226}; 241};
227 242
228struct object : zero_initialised, object_keep, object_copy, object_pod 243struct object : zero_initialised, object_keep, object_copy, object_pod
229{ 244{
245 typedef unordered_vector<object *> vector;
246
247 static vector mortals;
248 static vector active; // active objects, not yet used
249 static vector objects; // not used yet, use first->next->...
250 static object *first; // will be replaced by "objects"
251
230 static object *create (); 252 static object *create ();
253 void copy_to (object *dst);
254 object *clone (); // create + copy_to
231 void free (bool free_inventory = false); 255 void destroy (bool destroy_inventory = false);
256 void remove ();
257 object *insert (object *item); // insert into inventory
232 258
233 static void free_mortals (); 259 static void free_mortals ();
260 static bool can_merge_slow (object *op1, object *op2);
261
262 // this is often used in time-critical code, so optimise
234 static bool can_merge (object *op1, object *op2); 263 static bool can_merge (object *op1, object *op2)
264 {
265 return op1->value == op2->value
266 && op1->name == op2->name
267 && can_merge_slow (op1, op2);
268 }
235 269
236 void clear (); 270 void clear ();
237 void clone (object *destination); 271
272 bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
238 273
239 void set_owner (object *owner); 274 void set_owner (object *owner);
240 object *get_owner (); 275
276 void instantiate ()
277 {
278 if (!uuid.seq) // HACK
279 uuid = gen_uuid ();
280
281 attachable<object>::instantiate ();
282 }
283
284 // info must hold 256 * 3 bytes currently
285 const char *debug_desc (char *info) const;
286 const char *debug_desc () const;
241 287
242 // fully recursive iterator 288 // fully recursive iterator
243 struct iterator_base 289 struct iterator_base
244 { 290 {
245 object *item; 291 object *item;
… …
282 328
283 object (); 329 object ();
284 ~object (); 330 ~object ();
285}; 331};
286 332
287#define get_object() object::create ()
288#define free_object(op) (op)->free (0)
289#define free_object2(op, free_inv) (op)->free (free_inv)
290#define clear_owner(op) (op)->owner = 0
291#define copy_owner(op,other) (op)->owner = (other)->owner
292#define clear_object(op) (op)->clear ()
293
294static inline object *
295get_owner (object *op)
296{
297 return op->get_owner ();
298}
299
300static inline void
301set_owner (object *op, object *owner)
302{
303 op->set_owner (owner);
304}
305
306#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
307
308typedef struct oblnk 333typedef struct oblnk
309{ /* Used to link together several objects */ 334{ /* Used to link together several objects */
310 object *ob; 335 object_ptr ob;
311 struct oblnk *next; 336 struct oblnk *next;
312 tag_t id;
313} objectlink; 337} objectlink;
314 338
315typedef struct oblinkpt 339typedef struct oblinkpt
316{ /* Used to link together several object links */ 340{ /* Used to link together several object links */
317 struct oblnk *link; 341 struct oblnk *link;
… …
326 * be much left in the archetype - all it really is is a holder for the 350 * be much left in the archetype - all it really is is a holder for the
327 * object and pointers. This structure should get removed, and just replaced 351 * object and pointers. This structure should get removed, and just replaced
328 * by the object structure 352 * by the object structure
329 */ 353 */
330 354
331ACC_CLASS(archetype) 355ACC_CLASS (archetype)
332struct archetype : zero_initialised 356struct archetype : zero_initialised, refcounted
333{ 357{
334 archetype (); 358 archetype ();
335 ~archetype (); 359 ~archetype ();
336 360
361 static archetype *find (const char *arch);
362
363 void hash_add (); // add to hastable
364 void hash_del (); // remove from hashtable
365
337 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */ 366 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */
338 struct archetype *ACC (RW, next); /* Next archetype in a linked list */ 367 struct archetype *ACC (RW, next); /* Next archetype in a linked list */
339 struct archetype *ACC (RW, head); /* The main part of a linked object */ 368 struct archetype *ACC (RW, head); /* The main part of a linked object */
340 struct archetype *ACC (RW, more); /* Next part of a linked object */ 369 struct archetype *ACC (RW, more); /* Next part of a linked object */
341 object ACC (RO, clone); /* An object from which to do copy_object() */ 370 object ACC (RO, clone); /* An object from which to do ->copy_to () */
342 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */ 371 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
343 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is 372 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is
344 * in comparison to the head. 373 * in comparison to the head.
345 */ 374 */
346}; 375};
347 376
348extern object *objects; 377extern object *objects;
349extern object *active_objects; 378extern object *active_objects;
350 379
… …
402#define ARCH_DETECT_MAGIC "detect_magic" 431#define ARCH_DETECT_MAGIC "detect_magic"
403#define ARCH_DEPLETION "depletion" 432#define ARCH_DEPLETION "depletion"
404#define ARCH_SYMPTOM "symptom" 433#define ARCH_SYMPTOM "symptom"
405 434
406#endif 435#endif
436

Diff Legend

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