| … | |
… | |
| 84 | materialtype_t *mt; |
84 | materialtype_t *mt; |
| 85 | |
85 | |
| 86 | if (op->materialname == NULL) |
86 | if (op->materialname == NULL) |
| 87 | { |
87 | { |
| 88 | for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) |
88 | for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) |
| 89 | if (op->material & mt->material) |
89 | if (op->materials & mt->material) |
| 90 | break; |
90 | break; |
| 91 | } |
91 | } |
| 92 | else |
92 | else |
| 93 | mt = name_to_material (op->materialname); |
93 | mt = name_to_material (op->materialname); |
| 94 | |
94 | |
| … | |
… | |
| 375 | * that weak walls have is_alive set, which prevent objects from |
375 | * that weak walls have is_alive set, which prevent objects from |
| 376 | * passing over/through them. We don't care what type of movement |
376 | * passing over/through them. We don't care what type of movement |
| 377 | * the wall blocks - if it blocks any type of movement, can't be |
377 | * the wall blocks - if it blocks any type of movement, can't be |
| 378 | * destroyed right now. |
378 | * destroyed right now. |
| 379 | */ |
379 | */ |
| 380 | else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block) |
380 | else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block) |
| 381 | { |
381 | { |
| 382 | save_throw_object (tmp, type, op); |
382 | save_throw_object (tmp, type, op); |
| 383 | |
383 | |
| 384 | if (op->destroyed ()) |
384 | if (op->destroyed ()) |
| 385 | break; |
385 | break; |
| … | |
… | |
| 1203 | if (tmp->invisible) |
1203 | if (tmp->invisible) |
| 1204 | continue; |
1204 | continue; |
| 1205 | if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10)) |
1205 | if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10)) |
| 1206 | /* >= 10% acid res. on items will protect these */ |
1206 | /* >= 10% acid res. on items will protect these */ |
| 1207 | continue; |
1207 | continue; |
| 1208 | if (!(tmp->material & M_IRON)) |
1208 | if (!(tmp->materials & M_IRON)) |
| 1209 | continue; |
1209 | continue; |
| 1210 | if (tmp->magic < -4) /* Let's stop at -5 */ |
1210 | if (tmp->magic < -4) /* Let's stop at -5 */ |
| 1211 | continue; |
1211 | continue; |
| 1212 | if (tmp->type == RING |
1212 | if (tmp->type == RING |
| 1213 | /* removed boots and gloves from exclusion list in PR */ |
1213 | /* removed boots and gloves from exclusion list in PR */ |
