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.150 by root, Wed Sep 12 11:10:10 2007 UTC vs.
Revision 1.151 by root, Sun Sep 30 20:22:19 2007 UTC

507 MTH struct region *region () const; 507 MTH struct region *region () const;
508 508
509 void statusmsg (const char *msg, int color = NDI_BLACK); 509 void statusmsg (const char *msg, int color = NDI_BLACK);
510 void failmsg (const char *msg, int color = NDI_RED); 510 void failmsg (const char *msg, int color = NDI_RED);
511 511
512 const char *query_inventory (object *who = 0, const char *indent = "");
513
512 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference 514 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
513 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible 515 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
514 516
515protected: 517protected:
516 void link (); 518 void link ();
637 * INS_BELOW_ORIGINATOR: Insert new object immediately below originator - 639 * INS_BELOW_ORIGINATOR: Insert new object immediately below originator -
638 * Use for treasure chests so the new object is the highest thing 640 * Use for treasure chests so the new object is the highest thing
639 * beneath the player, but not actually above it. Note - the 641 * beneath the player, but not actually above it. Note - the
640 * map and x,y coordinates for the object to be inserted must 642 * map and x,y coordinates for the object to be inserted must
641 * match the originator. 643 * match the originator.
642 * INS_MAP_LOAD: disable lots of checkings done at insertion to
643 * speed up map loading process, as we assume the ordering in
644 * loaded map is correct.
645 * 644 *
646 * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY 645 * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY
647 * are mutually exclusive. The behaviour for passing more than one 646 * are mutually exclusive. The behaviour for passing more than one
648 * should be considered undefined - while you may notice what happens 647 * should be considered undefined - while you may notice what happens
649 * right now if you pass more than one, that could very well change 648 * right now if you pass more than one, that could very well change
652#define INS_NO_MERGE 0x0001 651#define INS_NO_MERGE 0x0001
653#define INS_ABOVE_FLOOR_ONLY 0x0002 652#define INS_ABOVE_FLOOR_ONLY 0x0002
654#define INS_NO_WALK_ON 0x0004 653#define INS_NO_WALK_ON 0x0004
655#define INS_ON_TOP 0x0008 654#define INS_ON_TOP 0x0008
656#define INS_BELOW_ORIGINATOR 0x0010 655#define INS_BELOW_ORIGINATOR 0x0010
657#define INS_MAP_LOAD 0x0020
658 656
659#define ARCH_DEPLETION "depletion" 657#define ARCH_DEPLETION "depletion"
660 658
661#endif 659#endif
662 660

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines