--- deliantra/server/include/object.h	2007/07/01 05:00:18	1.135
+++ deliantra/server/include/object.h	2007/08/25 22:19:26	1.145
@@ -186,7 +186,9 @@
   uint32 ACC (RW, weapontype);	/* type of weapon */
   uint32 ACC (RW, tooltype);	/* type of tool or build facility */
   body_slot slot [NUM_BODY_LOCATIONS];
-  faceidx ACC (RW, face);	/* Face with colors */
+  faceidx ACC (RW, face);	/* the graphical face */
+  faceidx ACC (RW, sound);      /* the sound face */
+  faceidx ACC (RW, sound_destroy); /* played on destroy */
   living ACC (RO, stats);	/* Str, Con, Dex, etc */
   /* See the pod/objects.pod for more info about body locations */
 
@@ -250,7 +252,7 @@
   object_vector_index ACC (RO, index);	// index into objects
   object_vector_index ACC (RO, active); // index into actives
 
-  player_ptr ACC (RW, contr);	/* Pointer to the player which control this object */
+  player_ptr ACC (RW, contr);	/* Pointer to the player which control this object, ALWAYS set *iff* type == PLAYER */
 
   object *ACC (RW, below);	/* Pointer to the object stacked below this one */
   object *ACC (RW, above);	/* Pointer to the object stacked above this one */
@@ -286,6 +288,8 @@
   // recursively destroy all objects in inventory, optionally dropping them to the ground instead
   MTH void destroy_inv (bool drop_to_ground = false);
   MTH object *insert (object *item); // insert into inventory
+  MTH void play_sound (faceidx sound) const;
+
   void do_remove ();
   MTH void remove ()
   {
@@ -314,6 +318,9 @@
     open_container (0);
   }
 
+  MTH object *force_find (const shstr name);
+  MTH void force_add (const shstr name, int duration = 0);
+
   // overwrite the attachable should_invoke function with a version that also checks ev_want_type
   bool should_invoke (event_type event)
   {
@@ -378,7 +385,7 @@
   // contr => is a player
   // head  => only save head of a multitile object
   // owner => can not reference owner yet
-  MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_MAP_SAVE]; }
+  MTH bool can_map_save () const { return !head && (!owner || owner->contr) && !contr && !flag [FLAG_NO_MAP_SAVE]; }
 
   /* This return true if object has still randomitems which
    * could be expanded.
@@ -422,6 +429,7 @@
   // insert object at same map position as 'where'
   // handles both inventory and map "positions"
   MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
+  MTH void drop_unpaid_items ();
 
   MTH void activate   ();
   MTH void deactivate ();
@@ -487,6 +495,9 @@
 
   MTH struct region *region () const;
 
+  void statusmsg (const char *msg, int color = NDI_BLACK);
+  void failmsg (const char *msg, int color = NDI_RED);
+
 protected:
   void link   ();
   void unlink ();