| … | … | ||
|---|---|---|---|
| 171 | 171 | ||
| 172 | return mt; | 172 | return mt; |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | //-GPL | 175 | //-GPL |
| 176 | |||
| 177 | const materialtype_t * | ||
| 178 | object::dominant_material () const | ||
| 179 | { | ||
| 180 | if (materialtype_t *mt = name_to_material (materialname)) | ||
| 181 | return mt; | ||
| 182 | |||
| 183 | return name_to_material (shstr_unknown); | ||
| 184 | } | ||
| 176 | 185 | ||
| 177 | void | 186 | void |
| 178 | load_materials (void) | 187 | load_materials (void) |
| 179 | { | 188 | { |
| 180 | char filename[MAX_BUF]; | 189 | char filename[MAX_BUF]; |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |