ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.301 by root, Mon Nov 9 18:47:56 2009 UTC vs.
Revision 1.302 by root, Tue Nov 10 00:01:31 2009 UTC

2517{ 2517{
2518 return map ? map->region (x, y) 2518 return map ? map->region (x, y)
2519 : region::default_region (); 2519 : region::default_region ();
2520} 2520}
2521 2521
2522const materialtype_t *
2523object::dominant_material () const
2524{
2525 if (materialtype_t *mt = name_to_material (materialname))
2526 return mt;
2527
2528 return name_to_material (shstr_unknown);
2529}
2530
2531void 2522void
2532object::open_container (object *new_container) 2523object::open_container (object *new_container)
2533{ 2524{
2534 if (container == new_container) 2525 if (container == new_container)
2535 return; 2526 return;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines