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.82 by root, Mon Jan 8 14:11:05 2007 UTC vs.
Revision 1.84 by root, Tue Jan 9 21:32:42 2007 UTC

… …
226 226
227 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 */
228 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 */
229 /* Note: stacked in the *same* environment */ 229 /* Note: stacked in the *same* environment */
230 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
231 object *ACC (RW, container); /* Current container being used. I think this 233 object *ACC (RW, container); /* Current container being used. I think this
232 * is only used by the player right now. 234 * is only used by the player right now.
233 */ 235 */
234 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.
235 * This is typically the container that the object is in. 237 * This is typically the container that the object is in.
236 */ 238 */
237 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ 239 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
238 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different 240 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
239 client_container *seen_by; // seen by which player/container currently? 241 client_container *seen_by; // seen by which player/container currently?
240
241 //static vector active_list; // active objects, not yet used
242 //static vector object_list; // not used yet, use first->next->...
243 static object *first; // will be replaced by "objects"
244 242
245 MTH static object *create (); 243 MTH static object *create ();
246 MTH void copy_to (object *dst); 244 MTH void copy_to (object *dst);
247 MTH object *clone (); // create + copy_to 245 MTH object *clone (); // create + copy_to
248 void do_destroy (); 246 void do_destroy ();
… …
387 object *end () 385 object *end ()
388 { 386 {
389 return this; 387 return this;
390 } 388 }
391 389
390 /* This returns TRUE if the object is something that
391 * should be displayed in the floorbox/inventory window
392 */
393 MTH bool client_visible () const
394 {
395 return !invisible && type != PLAYER;
396 }
397
392protected: 398protected:
393 friend struct archetype; 399 friend struct archetype;
394 400
395 void link (); 401 void link ();
396 void unlink (); 402 void unlink ();
… …
455 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */ 461 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
456 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is 462 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is
457 * in comparison to the head. 463 * in comparison to the head.
458 */ 464 */
459}; 465};
460
461/* This returns TRUE if the object is something that
462 * should be displayed in the floorbox window
463 */
464#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR)
465 466
466/* Used by update_object to know if the object being passed is 467/* Used by update_object to know if the object being passed is
467 * being added or removed. 468 * being added or removed.
468 */ 469 */
469#define UP_OBJ_INSERT 1 470#define UP_OBJ_INSERT 1

Diff Legend

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