| … | … | ||
|---|---|---|---|
| 2615 | { | 2615 | { |
| 2616 | return map ? map->region (x, y) | 2616 | return map ? map->region (x, y) |
| 2617 | : region::default_region (); | 2617 | : region::default_region (); |
| 2618 | } | 2618 | } |
| 2619 | 2619 | ||
| 2620 | const materialtype_t * | ||
| 2621 | object::dominant_material () const | ||
| 2622 | { | ||
| 2623 | if (materialtype_t *mat = name_to_material (materialname)) | ||
| 2624 | return mat; | ||
| 2625 | |||
| 2626 | // omfg this is slow, this has to be temporary :) | ||
| 2627 | shstr unknown ("unknown"); | ||
| 2628 | |||
| 2629 | return name_to_material (unknown); | ||
| 2630 | } | ||
| 2631 |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |