| … | |
… | |
| 2640 | } |
2640 | } |
| 2641 | |
2641 | |
| 2642 | const materialtype_t * |
2642 | const materialtype_t * |
| 2643 | object::dominant_material () const |
2643 | object::dominant_material () const |
| 2644 | { |
2644 | { |
| 2645 | if (materialtype_t *mat = name_to_material (materialname)) |
2645 | if (materialtype_t *mt = name_to_material (materialname)) |
| 2646 | return mat; |
2646 | return mt; |
| 2647 | |
2647 | |
| 2648 | // omfg this is slow, this has to be temporary :) |
|
|
| 2649 | shstr unknown ("unknown"); |
|
|
| 2650 | |
|
|
| 2651 | return name_to_material (unknown); |
2648 | return name_to_material (shstr_unknown); |
| 2652 | } |
2649 | } |
| 2653 | |
2650 | |
| 2654 | void |
2651 | void |
| 2655 | object::open_container (object *new_container) |
2652 | object::open_container (object *new_container) |
| 2656 | { |
2653 | { |
