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.149 by root, Mon Sep 10 12:44:06 2007 UTC vs.
Revision 1.151 by root, Sun Sep 30 20:22:19 2007 UTC

297 { 297 {
298 if (!flag [FLAG_REMOVED]) 298 if (!flag [FLAG_REMOVED])
299 do_remove (); 299 do_remove ();
300 } 300 }
301 301
302 MTH bool blocked (maptile *m, int x, int y) const;
303
302 void move_to (const mapxy &pos) 304 void move_to (const mapxy &pos)
303 { 305 {
304 remove (); 306 remove ();
305 *this = pos; 307 *this = pos;
306 insert_at (this, this); 308 insert_at (this, this);
504 506
505 MTH struct region *region () const; 507 MTH struct region *region () const;
506 508
507 void statusmsg (const char *msg, int color = NDI_BLACK); 509 void statusmsg (const char *msg, int color = NDI_BLACK);
508 void failmsg (const char *msg, int color = NDI_RED); 510 void failmsg (const char *msg, int color = NDI_RED);
511
512 const char *query_inventory (object *who = 0, const char *indent = "");
509 513
510 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
511 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
512 516
513protected: 517protected:
635 * INS_BELOW_ORIGINATOR: Insert new object immediately below originator - 639 * INS_BELOW_ORIGINATOR: Insert new object immediately below originator -
636 * 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
637 * beneath the player, but not actually above it. Note - the 641 * beneath the player, but not actually above it. Note - the
638 * 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
639 * match the originator. 643 * match the originator.
640 * INS_MAP_LOAD: disable lots of checkings done at insertion to
641 * speed up map loading process, as we assume the ordering in
642 * loaded map is correct.
643 * 644 *
644 * 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
645 * are mutually exclusive. The behaviour for passing more than one 646 * are mutually exclusive. The behaviour for passing more than one
646 * should be considered undefined - while you may notice what happens 647 * should be considered undefined - while you may notice what happens
647 * 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
650#define INS_NO_MERGE 0x0001 651#define INS_NO_MERGE 0x0001
651#define INS_ABOVE_FLOOR_ONLY 0x0002 652#define INS_ABOVE_FLOOR_ONLY 0x0002
652#define INS_NO_WALK_ON 0x0004 653#define INS_NO_WALK_ON 0x0004
653#define INS_ON_TOP 0x0008 654#define INS_ON_TOP 0x0008
654#define INS_BELOW_ORIGINATOR 0x0010 655#define INS_BELOW_ORIGINATOR 0x0010
655#define INS_MAP_LOAD 0x0020
656 656
657#define ARCH_DEPLETION "depletion" 657#define ARCH_DEPLETION "depletion"
658 658
659#endif 659#endif
660 660

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines