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.152 by root, Tue Oct 16 00:30:24 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 ();
… …
577 MTH static archetype *get (const_utf8_string name); // find or create 579 MTH static archetype *get (const_utf8_string name); // find or create
578 MTH static archetype *find (const_utf8_string name); 580 MTH static archetype *find (const_utf8_string name);
579 581
580 MTH void link (); 582 MTH void link ();
581 MTH void unlink (); 583 MTH void unlink ();
584
585 MTH object *instance ();
582 586
583 object_vector_index ACC (RW, archid); // index in archvector 587 object_vector_index ACC (RW, archid); // index in archvector
584 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ 588 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
585 bool ACC (RW, stub); // if true, this is an invalid archetype 589 bool ACC (RW, stub); // if true, this is an invalid archetype
586 590
… …
637 * INS_BELOW_ORIGINATOR: Insert new object immediately below originator - 641 * INS_BELOW_ORIGINATOR: Insert new object immediately below originator -
638 * Use for treasure chests so the new object is the highest thing 642 * Use for treasure chests so the new object is the highest thing
639 * beneath the player, but not actually above it. Note - the 643 * beneath the player, but not actually above it. Note - the
640 * map and x,y coordinates for the object to be inserted must 644 * map and x,y coordinates for the object to be inserted must
641 * match the originator. 645 * 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 * 646 *
646 * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY 647 * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY
647 * are mutually exclusive. The behaviour for passing more than one 648 * are mutually exclusive. The behaviour for passing more than one
648 * should be considered undefined - while you may notice what happens 649 * should be considered undefined - while you may notice what happens
649 * right now if you pass more than one, that could very well change 650 * right now if you pass more than one, that could very well change
… …
652#define INS_NO_MERGE 0x0001 653#define INS_NO_MERGE 0x0001
653#define INS_ABOVE_FLOOR_ONLY 0x0002 654#define INS_ABOVE_FLOOR_ONLY 0x0002
654#define INS_NO_WALK_ON 0x0004 655#define INS_NO_WALK_ON 0x0004
655#define INS_ON_TOP 0x0008 656#define INS_ON_TOP 0x0008
656#define INS_BELOW_ORIGINATOR 0x0010 657#define INS_BELOW_ORIGINATOR 0x0010
657#define INS_MAP_LOAD 0x0020
658 658
659#define ARCH_DEPLETION "depletion" 659#define ARCH_DEPLETION "depletion"
660 660
661#endif 661#endif
662 662

Diff Legend

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