--- deliantra/server/include/object.h 2007/09/12 11:10:10 1.150 +++ deliantra/server/include/object.h 2007/10/16 00:30:24 1.152 @@ -509,6 +509,8 @@ void statusmsg (const char *msg, int color = NDI_BLACK); void failmsg (const char *msg, int color = NDI_RED); + const char *query_inventory (object *who = 0, const char *indent = ""); + MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible @@ -580,6 +582,8 @@ MTH void link (); MTH void unlink (); + MTH object *instance (); + object_vector_index ACC (RW, archid); // index in archvector shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ bool ACC (RW, stub); // if true, this is an invalid archetype @@ -639,9 +643,6 @@ * beneath the player, but not actually above it. Note - the * map and x,y coordinates for the object to be inserted must * match the originator. - * INS_MAP_LOAD: disable lots of checkings done at insertion to - * speed up map loading process, as we assume the ordering in - * loaded map is correct. * * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY * are mutually exclusive. The behaviour for passing more than one @@ -654,7 +655,6 @@ #define INS_NO_WALK_ON 0x0004 #define INS_ON_TOP 0x0008 #define INS_BELOW_ORIGINATOR 0x0010 -#define INS_MAP_LOAD 0x0020 #define ARCH_DEPLETION "depletion"