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.43 by root, Sun Oct 15 02:16:35 2006 UTC vs.
Revision 1.47 by root, Wed Dec 6 13:59:01 2006 UTC

… …
63 uint64 seq; 63 uint64 seq;
64}; 64};
65 65
66extern void init_uuid (); 66extern void init_uuid ();
67extern UUID gen_uuid (); 67extern UUID gen_uuid ();
68extern const uint64 UUID_SKIP;
68 69
69/* Definition for WILL_APPLY values. Replaces having harcoded values 70/* Definition for WILL_APPLY values. Replaces having harcoded values
70 * sprinkled in the code. Note that some of these also replace fields 71 * sprinkled in the code. Note that some of these also replace fields
71 * that were in the can_apply area. What is the point of having both 72 * that were in the can_apply area. What is the point of having both
72 * can_apply and will_apply? 73 * can_apply and will_apply?
… …
81 * don't just want it copied, so you'll need to add to common/object.C, 82 * don't just want it copied, so you'll need to add to common/object.C,
82 * e.g. copy_object. 83 * e.g. copy_object.
83 */ 84 */
84 85
85typedef refptr<object> object_ptr; 86typedef refptr<object> object_ptr;
87typedef refptr<archetype> arch_ptr;
86 88
87// these are not being copied 89// these are not being copied
88ACC_CLASS (object) 90ACC_CLASS (object)
89struct object_keep : refcounted 91struct object_keep : refcounted
90{ 92{
91 tag_t ACC (RW, count); /* Generation count for this object */ 93 tag_t ACC (RW, count); /* Generation count for this object */
92 UUID uuid; // Unique Identifier, survives saves etc. 94 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
93 95
94 /* These variables are not changed by copy_object() */ 96 /* These variables are not changed by copy_object() */
95 player *ACC (RW, contr); /* Pointer to the player which control this object */ 97 player *ACC (RW, contr); /* Pointer to the player which control this object */
96 object *ACC (RW, next); /* Pointer to the next object in the free/used list */ 98 object *ACC (RW, next); /* Pointer to the next object in the free/used list */
97 object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */ 99 object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */
98 object *ACC (RW, active_next); /* Next & previous object in the 'active' */ 100 object *ACC (RW, active_next);/* Next & previous object in the 'active' */
99 object *ACC (RW, active_prev); /* List. This is used in process_events */ 101 object *ACC (RW, active_prev);/* List. This is used in process_events */
100 /* so that the entire object list does not */ 102 /* so that the entire object list does not */
101 /* need to be gone through. */ 103 /* need to be gone through. */
102 object *ACC (RW, below); /* Pointer to the object stacked below this one */ 104 object *ACC (RW, below); /* Pointer to the object stacked below this one */
103 object *ACC (RW, above); /* Pointer to the object stacked above this one */ 105 object *ACC (RW, above); /* Pointer to the object stacked above this one */
104 /* Note: stacked in the *same* environment */ 106 /* Note: stacked in the *same* environment */
105 object *inv; /* Pointer to the first object in the inventory */ 107 object *inv; /* Pointer to the first object in the inventory */
106 object *ACC (RW, container); /* Current container being used. I think this 108 object *ACC (RW, container); /* Current container being used. I think this
107 * is only used by the player right now. 109 * is only used by the player right now.
108 */ 110 */
109 object *ACC (RW, env); /* Pointer to the object which is the environment. 111 object *ACC (RW, env); /* Pointer to the object which is the environment.
110 * This is typically the container that the object is in. 112 * This is typically the container that the object is in.
111 */ 113 */
112 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ 114 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
113 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different 115 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
… …
117// these are being copied 119// these are being copied
118struct object_copy : attachable<object> 120struct object_copy : attachable<object>
119{ 121{
120 shstr ACC (RW, name); /* The name of the object, obviously... */ 122 shstr ACC (RW, name); /* The name of the object, obviously... */
121 shstr ACC (RW, name_pl); /* The plural name of the object */ 123 shstr ACC (RW, name_pl); /* The plural name of the object */
122 shstr ACC (RW, title); /* Of foo, etc */ 124 shstr ACC (RW, title); /* Of foo, etc */
123 shstr ACC (RW, race); /* human, goblin, dragon, etc */ 125 shstr ACC (RW, race); /* human, goblin, dragon, etc */
124 shstr ACC (RW, slaying); /* Which race to do double damage to */ 126 shstr ACC (RW, slaying); /* Which race to do double damage to */
125 /* If this is an exit, this is the filename */ 127 /* If this is an exit, this is the filename */
126 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */ 128 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
127 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */ 129 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
128 shstr ACC (RW, lore); /* Obscure information about this object, */ 130 shstr ACC (RW, lore); /* Obscure information about this object, */
129 /* To get put into books and the like. */ 131 /* To get put into books and the like. */
130 shstr ACC (RW, materialname); /* specific material name */ 132 shstr ACC (RW, materialname); /* specific material name */
131 shstr ACC (RW, custom_name); /* Custom name assigned by player */ 133 shstr ACC (RW, custom_name); /* Custom name assigned by player */
… …
141// these are being copied and also cleared 143// these are being copied and also cleared
142struct object_pod 144struct object_pod
143{ 145{
144 New_Face *ACC (RW, face); /* Face with colors */ 146 New_Face *ACC (RW, face); /* Face with colors */
145 sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */ 147 sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
146 float ACC (RW, speed); /* The overall speed of this object */ 148 float ACC (RW, speed); /* The overall speed of this object */
147 float ACC (RW, speed_left); /* How much speed is left to spend this round */ 149 float ACC (RW, speed_left); /* How much speed is left to spend this round */
148 uint32 ACC (RW, nrof); /* How many of the objects */ 150 uint32 ACC (RW, nrof); /* How many of the objects */
149 sint8 ACC (RW, direction); /* Means the object is moving that way. */ 151 sint8 ACC (RW, direction); /* Means the object is moving that way. */
150 sint8 ACC (RW, facing); /* Object is oriented/facing that way. */ 152 sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
151 153
152 /* This next big block are basically used for monsters and equipment */ 154 /* This next big block are basically used for monsters and equipment */
153 uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */ 155 uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */
154 uint8 ACC (RW, subtype); /* subtype of object */ 156 uint8 ACC (RW, subtype); /* subtype of object */
155 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */ 157 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */
156 sint16 resist[NROFATTACKS]; /* Resistance adjustments for attacks */ 158 sint16 resist[NROFATTACKS]; /* Resistance adjustments for attacks */
157 uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */ 159 uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */
158 uint32 ACC (RW, path_attuned); /* Paths the object is attuned to */ 160 uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */
159 uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */ 161 uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */
160 uint32 ACC (RW, path_denied); /* Paths the object is denied access to */ 162 uint32 ACC (RW, path_denied); /* Paths the object is denied access to */
161 uint16 ACC (RW, material); /* What materials this object consist of */ 163 uint16 ACC (RW, material); /* What materials this object consist of */
162 sint8 ACC (RW, magic); /* Any magical bonuses to this item */ 164 sint8 ACC (RW, magic); /* Any magical bonuses to this item */
163 uint8 ACC (RW, state); /* How the object was last drawn (animation) */ 165 uint8 ACC (RW, state); /* How the object was last drawn (animation) */
164 sint32 ACC (RW, value); /* How much money it is worth (or contains) */ 166 sint32 ACC (RW, value); /* How much money it is worth (or contains) */
165 /* Note that the last_.. values are sometimes used for non obvious 167 /* Note that the last_.. values are sometimes used for non obvious
166 * meanings by some objects, eg, sp penalty, permanent exp. 168 * meanings by some objects, eg, sp penalty, permanent exp.
167 */ 169 */
168 sint32 ACC (RW, last_heal); /* Last healed. Depends on constitution */ 170 sint32 ACC (RW, last_heal); /* Last healed. Depends on constitution */
… …
171 sint16 ACC (RW, last_eat); /* How long since we last ate */ 173 sint16 ACC (RW, last_eat); /* How long since we last ate */
172 sint16 ACC (RW, invisible); /* How much longer the object will be invis */ 174 sint16 ACC (RW, invisible); /* How much longer the object will be invis */
173 sint16 ACC (RW, level); /* Level of creature or object */ 175 sint16 ACC (RW, level); /* Level of creature or object */
174 uint8 ACC (RW, pick_up); /* See crossfire.doc */ 176 uint8 ACC (RW, pick_up); /* See crossfire.doc */
175 sint8 ACC (RW, item_power); /* power rating of the object */ 177 sint8 ACC (RW, item_power); /* power rating of the object */
176 sint8 ACC (RW, gen_sp_armour); /* sp regen penalty this object has (was last_heal) */ 178 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */
177 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */ 179 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */
178 sint32 ACC (RW, weight); /* Attributes of the object */ 180 sint32 ACC (RW, weight); /* Attributes of the object */
179 sint32 ACC (RW, weight_limit); /* Weight-limit of object */ 181 sint32 ACC (RW, weight_limit);/* Weight-limit of object */
180 sint32 ACC (RW, carrying); /* How much weight this object contains */ 182 sint32 ACC (RW, carrying); /* How much weight this object contains */
181 sint64 ACC (RW, perm_exp); /* Permanent exp */ 183 sint64 ACC (RW, perm_exp); /* Permanent exp */
182 uint32 ACC (RW, weapontype); /* type of weapon */ 184 uint32 ACC (RW, weapontype); /* type of weapon */
183 uint32 ACC (RW, tooltype); /* type of tool or build facility */ 185 uint32 ACC (RW, tooltype); /* type of tool or build facility */
184 sint8 body_info[NUM_BODY_LOCATIONS]; /* body info as loaded from the file */ 186 sint8 body_info[NUM_BODY_LOCATIONS]; /* body info as loaded from the file */
185 sint8 body_used[NUM_BODY_LOCATIONS]; /* Calculated value based on items equipped */ 187 sint8 body_used[NUM_BODY_LOCATIONS]; /* Calculated value based on items equipped */
186 living ACC (RO, stats); /* Str, Con, Dex, etc */ 188 living ACC (RO, stats); /* Str, Con, Dex, etc */
187 /* See the doc/Developers/objects for more info about body locations */ 189 /* See the doc/Developers/objects for more info about body locations */
188 190
189 /* Following mostly refers to fields only used for monsters */ 191 /* Following mostly refers to fields only used for monsters */
190 uint32 ACC (RW, hide); /* The object is hidden, not invisible */ 192 uint32 ACC (RW, hide); /* The object is hidden, not invisible */
191 /* changes made by kholland@sunlab.cit.cornell.edu */ 193 /* changes made by kholland@sunlab.cit.cornell.edu */
192 /* allows different movement patterns for attackers */ 194 /* allows different movement patterns for attackers */
193 sint32 ACC (RW, move_status); /* What stage in attack mode */ 195 sint32 ACC (RW, move_status); /* What stage in attack mode */
194 uint16 ACC (RW, attack_movement); /* What kind of attack movement */ 196 uint16 ACC (RW, attack_movement); /* What kind of attack movement */
195 uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */ 197 uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
… …
199 /* Spell related information, may be useful elsewhere 201 /* Spell related information, may be useful elsewhere
200 * Note that other fields are used - these files are basically 202 * Note that other fields are used - these files are basically
201 * only used in spells. 203 * only used in spells.
202 */ 204 */
203 sint16 ACC (RW, duration); /* How long the spell lasts */ 205 sint16 ACC (RW, duration); /* How long the spell lasts */
204 sint16 ACC (RW, casting_time); /* time left before spell goes off */ 206 sint16 ACC (RW, casting_time);/* time left before spell goes off */
205 uint16 ACC (RW, start_holding); 207 uint16 ACC (RW, start_holding);
206 uint8 ACC (RW, duration_modifier); /* how level modifies duration */ 208 uint8 ACC (RW, duration_modifier); /* how level modifies duration */
207 uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */ 209 uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */
208 sint8 ACC (RW, range); /* Range of the spell */ 210 sint8 ACC (RW, range); /* Range of the spell */
209 uint8 ACC (RW, range_modifier); /* How going up in level effects range */ 211 uint8 ACC (RW, range_modifier); /* How going up in level effects range */
210 char *ACC (RW, spellarg); 212 char *ACC (RW, spellarg);
211 213
212 /* Following are values used by any object */ 214 /* Following are values used by any object */
213 treasurelist *ACC (RW, randomitems); /* Items to be generated */ 215 treasurelist *ACC (RW, randomitems); /* Items to be generated */
214 archetype *ACC (RW, arch); /* Pointer to archetype */ 216 arch_ptr ACC (RW, arch); /* Pointer to archetype */
215 archetype *ACC (RW, other_arch); /* Pointer used for various things - mostly used for what */ 217 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
216 key_value *key_values; /* Fields not explictly known by the loader. */ 218 key_value *key_values; /* Fields not explictly known by the loader. */
217 /* this objects turns into or what this object creates */ 219 /* this objects turns into or what this object creates */
218 uint32 flags[4]; /* various flags */ 220 uint32 flags[4]; /* various flags */
219 uint16 ACC (RW, animation_id); /* An index into the animation array */ 221 uint16 ACC (RW, animation_id);/* An index into the animation array */
220 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */ 222 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
221 uint8 ACC (RW, last_anim); /* last sequence used to draw face */ 223 uint8 ACC (RW, last_anim); /* last sequence used to draw face */
222 sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */ 224 sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */
223 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */ 225 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
224 uint8 ACC (RW, will_apply); /* See crossfire.doc */ 226 uint8 ACC (RW, will_apply); /* See crossfire.doc */
225 227
226 MoveType ACC (RW, move_type); /* Type of movement this object uses */ 228 MoveType ACC (RW, move_type); /* Type of movement this object uses */
227 MoveType ACC (RW, move_block); /* What movement types this blocks */ 229 MoveType ACC (RW, move_block);/* What movement types this blocks */
228 MoveType ACC (RW, move_allow); /* What movement types explicitly allowd */ 230 MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */
229 MoveType ACC (RW, move_on); /* Move types affected moving on to this space */ 231 MoveType ACC (RW, move_on); /* Move types affected moving on to this space */
230 MoveType ACC (RW, move_off); /* Move types affected moving off this space */ 232 MoveType ACC (RW, move_off); /* Move types affected moving off this space */
231 MoveType ACC (RW, move_slow); /* Movement types this slows down */ 233 MoveType ACC (RW, move_slow); /* Movement types this slows down */
232 float ACC (RW, move_slow_penalty); /* How much this slows down the object */ 234 float ACC (RW, move_slow_penalty); /* How much this slows down the object */
233}; 235};
234 236
235struct object : zero_initialised, object_keep, object_copy, object_pod 237struct object : zero_initialised, object_keep, object_copy, object_pod
236{ 238{
… …
241 static vector objects; // not used yet, use first->next->... 243 static vector objects; // not used yet, use first->next->...
242 static object *first; // will be replaced by "objects" 244 static object *first; // will be replaced by "objects"
243 245
244 static object *create (); 246 static object *create ();
245 void destroy (bool destroy_inventory = false); 247 void destroy (bool destroy_inventory = false);
248 void remove ();
249 object *insert (object *item); // insert into inventory
246 250
247 static void free_mortals (); 251 static void free_mortals ();
248 static bool can_merge (object *op1, object *op2); 252 static bool can_merge (object *op1, object *op2);
249 253
250 void clear (); 254 void clear ();
… …
309 313
310 object (); 314 object ();
311 ~object (); 315 ~object ();
312}; 316};
313 317
318// compatibility functions/macros
314#define get_object() object::create () 319#define get_object() object::create ()
315#define free_object(op) (op)->destroy (0) 320#define free_object(op) (op)->destroy (0)
316#define free_object2(op, free_inv) (op)->destroy (free_inv) 321#define free_object2(op, free_inv) (op)->destroy (free_inv)
317#define clear_owner(op) (op)->owner = 0 322#define clear_owner(op) (op)->owner = 0
318#define copy_owner(op,other) (op)->owner = (other)->owner 323#define copy_owner(op,other) (op)->owner = (other)->owner
… …
323set_owner (object *op, object *owner) 328set_owner (object *op, object *owner)
324{ 329{
325 op->set_owner (owner); 330 op->set_owner (owner);
326} 331}
327 332
333static inline void
334remove_ob (object *op)
335{
336 op->remove ();
337}
338
328#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2))) 339#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
329 340
330typedef struct oblnk 341typedef struct oblnk
331{ /* Used to link together several objects */ 342{ /* Used to link together several objects */
332 object_ptr ob; 343 object_ptr ob;
… …
347 * be much left in the archetype - all it really is is a holder for the 358 * be much left in the archetype - all it really is is a holder for the
348 * object and pointers. This structure should get removed, and just replaced 359 * object and pointers. This structure should get removed, and just replaced
349 * by the object structure 360 * by the object structure
350 */ 361 */
351 362
352ACC_CLASS(archetype) 363ACC_CLASS (archetype)
353struct archetype : zero_initialised 364struct archetype : zero_initialised, refcounted
354{ 365{
355 archetype (); 366 archetype ();
356 ~archetype (); 367 ~archetype ();
357 368
358 static archetype *find (const char *arch); 369 static archetype *find (const char *arch);
370
371 void hash_add (); // add to hastable
372 void hash_del (); // remove from hashtable
359 373
360 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */ 374 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */
361 struct archetype *ACC (RW, next); /* Next archetype in a linked list */ 375 struct archetype *ACC (RW, next); /* Next archetype in a linked list */
362 struct archetype *ACC (RW, head); /* The main part of a linked object */ 376 struct archetype *ACC (RW, head); /* The main part of a linked object */
363 struct archetype *ACC (RW, more); /* Next part of a linked object */ 377 struct archetype *ACC (RW, more); /* Next part of a linked object */
… …
425#define ARCH_DETECT_MAGIC "detect_magic" 439#define ARCH_DETECT_MAGIC "detect_magic"
426#define ARCH_DEPLETION "depletion" 440#define ARCH_DEPLETION "depletion"
427#define ARCH_SYMPTOM "symptom" 441#define ARCH_SYMPTOM "symptom"
428 442
429#endif 443#endif
444

Diff Legend

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