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.80 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.83 by root, Mon Jan 8 22:32:10 2007 UTC

… …
28#include <bitset> 28#include <bitset>
29 29
30#include "cfperl.h" 30#include "cfperl.h"
31#include "shstr.h" 31#include "shstr.h"
32 32
33typedef uint32 tag_t; 33typedef int tag_t;
34#define NUM_BODY_LOCATIONS 12 34#define NUM_BODY_LOCATIONS 12
35#define BODY_ARMS 1 35#define BODY_ARMS 1
36 36
37/* See common/item.c */ 37/* See common/item.c */
38 38
… …
212 uint8 ACC (RW, will_apply); /* See crossfire.doc */ 212 uint8 ACC (RW, will_apply); /* See crossfire.doc */
213}; 213};
214 214
215struct object : zero_initialised, object_copy 215struct object : zero_initialised, object_copy
216{ 216{
217 typedef unordered_vector<object *> vector;
218
219 // These variables are not changed by ->copy_to 217 // These variables are not changed by ->copy_to
220 maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */ 218 maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */
221 219
222 tag_t ACC (RW, count); /* Generation count for this object */
223 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. 220 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
221 int ACC (RO, count);
222 int ACC (RO, index); // index into objects
223 int ACC (RO, active); // index into actives
224 224
225 player_ptr ACC (RW, contr); /* Pointer to the player which control this object */ 225 player_ptr ACC (RW, contr); /* Pointer to the player which control this object */
226 object *ACC (RW, next); /* Pointer to the next object in the free/used list */ 226
227 object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */
228 object *ACC (RW, active_next);/* Next & previous object in the 'active' */
229 object *ACC (RW, active_prev);/* List. This is used in process_events */
230 /* so that the entire object list does not */
231 /* need to be gone through. */
232 object *ACC (RW, below); /* Pointer to the object stacked below this one */ 227 object *ACC (RW, below); /* Pointer to the object stacked below this one */
233 object *ACC (RW, above); /* Pointer to the object stacked above this one */ 228 object *ACC (RW, above); /* Pointer to the object stacked above this one */
234 /* Note: stacked in the *same* environment */ 229 /* Note: stacked in the *same* environment */
235 object *inv; /* Pointer to the first object in the inventory */ 230 object *inv; /* Pointer to the first object in the inventory */
231
232 //TODO: container must move into client
236 object *ACC (RW, container); /* Current container being used. I think this 233 object *ACC (RW, container); /* Current container being used. I think this
237 * is only used by the player right now. 234 * is only used by the player right now.
238 */ 235 */
239 object *ACC (RW, env); /* Pointer to the object which is the environment. 236 object *ACC (RW, env); /* Pointer to the object which is the environment.
240 * This is typically the container that the object is in. 237 * This is typically the container that the object is in.
… …
338 335
339 // insert object at same map position as 'where' 336 // insert object at same map position as 'where'
340 // handles both inventory and map "positions" 337 // handles both inventory and map "positions"
341 MTH object *insert_at (object *where, object *originator = 0, int flags = 0); 338 MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
342 339
343 MTH bool active () const;
344 MTH void activate (); 340 MTH void activate ();
345 MTH void deactivate (); 341 MTH void deactivate ();
346 MTH void activate_recursive (); 342 MTH void activate_recursive ();
347 MTH void deactivate_recursive (); 343 MTH void deactivate_recursive ();
348 344
… …
402 void unlink (); 398 void unlink ();
403 399
404 object (); 400 object ();
405 ~object (); 401 ~object ();
406}; 402};
403
404typedef object_vector<object, &object::index > objectvec;
405typedef object_vector<object, &object::active> activevec;
406
407extern objectvec objects;
408extern activevec actives;
409
410#define for_all_objects(var) \
411 for (int _i = 0; _i < objects.size (); ++_i) \
412 declvar (object *, var, objects [_i])
413
414#define for_all_actives(var) \
415 for (int _i = 0; _i < actives.size (); ++_i) \
416 declvar (object *, var, actives [_i])
407 417
408typedef struct oblnk 418typedef struct oblnk
409{ /* Used to link together several objects */ 419{ /* Used to link together several objects */
410 object_ptr ob; 420 object_ptr ob;
411 struct oblnk *next; 421 struct oblnk *next;
… …
448 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is 458 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is
449 * in comparison to the head. 459 * in comparison to the head.
450 */ 460 */
451}; 461};
452 462
453extern object *objects;
454extern object *active_objects;
455
456extern int nrofallocobjects;
457
458/* This returns TRUE if the object is something that 463/* This returns TRUE if the object is something that
459 * should be displayed in the look window 464 * should be displayed in the floorbox window
460 */ 465 */
461#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR) 466#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR)
462 467
463/* Used by update_object to know if the object being passed is 468/* Used by update_object to know if the object being passed is
464 * being added or removed. 469 * being added or removed.

Diff Legend

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