[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.300 by root, Mon Nov 9 03:08:23 2009 UTC vs.
Revision 1.302 by root, Tue Nov 10 00:01:31 2009 UTC

     return where->env->insert (this);
   else
     return where->map->insert (this, where->x, where->y, originator, flags);
 }
-// check whether we can put this into the map, respect max_nrof, max_volume, max_items
+// check whether we can put this into the map, respect max_volume, max_items
 bool
 object::can_drop_at (maptile *m, int x, int y, object *originator)
 {
   mapspace &ms = m->at (x, y);
   int items = ms.items ();
   if (!items // testing !items ensures we can drop at least one item
       || (items < m->max_items
-          && ms.volume () < m->max_volume
+          && ms.volume () < m->max_volume))
-          && nrof <= m->max_nrof))
     return true;
   if (originator && originator->is_player ())
     originator->contr->failmsg (format (
        "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
 {
   return map ? map->region (x, y)
              : region::default_region ();
 }
-const materialtype_t *
-object::dominant_material () const
-{
-  if (materialtype_t *mt = name_to_material (materialname))
-    return mt;
-  return name_to_material (shstr_unknown);
-}
 void
 object::open_container (object *new_container)
 {
   if (container == new_container)
     return;

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