| … | |
… | |
| 492 | at_spell = archetype::find (cp); |
492 | at_spell = archetype::find (cp); |
| 493 | if (!at_spell || at_spell->clone.type != SPELL) |
493 | if (!at_spell || at_spell->clone.type != SPELL) |
| 494 | at_spell = find_archetype_by_object_name (cp); |
494 | at_spell = find_archetype_by_object_name (cp); |
| 495 | if (!at_spell || at_spell->clone.type != SPELL) |
495 | if (!at_spell || at_spell->clone.type != SPELL) |
| 496 | { |
496 | { |
| 497 | strcpy (spell_name, cp); |
497 | assign (spell_name, cp); |
| 498 | fsp = strchr (spell_name, ' '); |
498 | fsp = strchr (spell_name, ' '); |
| 499 | if (fsp) |
499 | if (fsp) |
| 500 | { |
500 | { |
| 501 | *fsp = 0; |
501 | *fsp = 0; |
| 502 | fsp++; |
502 | fsp++; |
| … | |
… | |
| 1005 | |
1005 | |
| 1006 | if (from != STACK_FROM_STACK) |
1006 | if (from != STACK_FROM_STACK) |
| 1007 | /* Item is either stack top, or is a number thus is now stack top, let's remove it */ |
1007 | /* Item is either stack top, or is a number thus is now stack top, let's remove it */ |
| 1008 | dm_stack_pop (op->contr); |
1008 | dm_stack_pop (op->contr); |
| 1009 | |
1009 | |
| 1010 | if (!QUERY_FLAG (tmp, FLAG_REMOVED)) |
|
|
| 1011 | { |
|
|
| 1012 | new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed."); |
|
|
| 1013 | tmp->remove (); |
|
|
| 1014 | } |
|
|
| 1015 | |
|
|
| 1016 | if (tmp->head) |
1010 | if (tmp->head) |
| 1017 | tmp = tmp->head; |
1011 | tmp = tmp->head; |
| 1018 | |
1012 | |
| 1019 | tmp->destroy (); |
1013 | tmp->destroy (); |
| 1020 | return 1; |
1014 | return 1; |
