| … | |
… | |
| 455 | |
455 | |
| 456 | if (op->stats.hp) |
456 | if (op->stats.hp) |
| 457 | { |
457 | { |
| 458 | for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below) |
458 | for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below) |
| 459 | { |
459 | { |
| 460 | if (op->slaying && !strcmp (op->slaying, tmp->name)) |
460 | if (op->slaying && op->slaying == tmp->name) |
| 461 | detected = 1; |
461 | detected = 1; |
|
|
462 | |
| 462 | if (tmp2->type == FORCE && tmp2->slaying && !strcmp (tmp2->slaying, op->slaying)) |
463 | if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->slaying) |
| 463 | detected = 1; |
464 | detected = 1; |
| 464 | } |
465 | } |
| 465 | } |
466 | } |
|
|
467 | |
| 466 | if (op->slaying && !strcmp (op->slaying, tmp->name)) |
468 | if (op->slaying && op->slaying == tmp->name) |
| 467 | { |
|
|
| 468 | detected = 1; |
469 | detected = 1; |
| 469 | } |
|
|
| 470 | else if (tmp->type == SPECIAL_KEY && tmp->slaying == op->slaying) |
470 | else if (tmp->type == SPECIAL_KEY && tmp->slaying == op->slaying) |
| 471 | detected = 1; |
471 | detected = 1; |
| 472 | } |
472 | } |
| 473 | |
473 | |
| 474 | /* the detector sets the button if detection is found */ |
474 | /* the detector sets the button if detection is found */ |
| … | |
… | |
| 1204 | return; |
1204 | return; |
| 1205 | } |
1205 | } |
| 1206 | |
1206 | |
| 1207 | if (op->above == NULL) |
1207 | if (op->above == NULL) |
| 1208 | return; |
1208 | return; |
|
|
1209 | |
| 1209 | for (tmp = op->above; tmp != NULL; tmp = tmp->above) |
1210 | for (tmp = op->above; tmp; tmp = tmp->above) |
| 1210 | { |
1211 | { |
| 1211 | if (strcmp (op->other_arch->name, tmp->arch->name) == 0) |
1212 | if (op->other_arch->name == tmp->arch->name) |
| 1212 | { |
1213 | { |
| 1213 | if (op->level <= 0) |
1214 | if (op->level <= 0) |
| 1214 | tmp->destroy (); |
1215 | tmp->destroy (); |
| 1215 | else |
1216 | else |
| 1216 | { |
1217 | { |
