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

Diff Legend

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