| … | |
… | |
| 280 | new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); |
280 | new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); |
| 281 | return 0; |
281 | return 0; |
| 282 | } |
282 | } |
| 283 | |
283 | |
| 284 | pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO |
284 | pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO |
| 285 | dummy->destroy (); |
285 | dummy->destroy (true); |
|
|
286 | |
| 286 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); |
287 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); |
| 287 | new_draw_info (NDI_UNIQUE, 0, op, "OK."); |
288 | new_draw_info (NDI_UNIQUE, 0, op, "OK."); |
| 288 | LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); |
289 | LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); |
| 289 | return 1; |
290 | return 1; |
| 290 | } |
291 | } |
| … | |
… | |
| 639 | if (out_of_map (op->map, head->x + size_x, head->y + size_y)) |
640 | if (out_of_map (op->map, head->x + size_x, head->y + size_y)) |
| 640 | { |
641 | { |
| 641 | if (head->x < size_x || head->y < size_y) |
642 | if (head->x < size_x || head->y < size_y) |
| 642 | { |
643 | { |
| 643 | dm_stack_pop (op->contr); |
644 | dm_stack_pop (op->contr); |
| 644 | head->destroy (); |
645 | head->destroy (true); |
| 645 | new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); |
646 | new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); |
| 646 | tmp->destroy (); |
647 | tmp->destroy (true); |
| 647 | return 1; |
648 | return 1; |
| 648 | } |
649 | } |
| 649 | |
650 | |
| 650 | check = head; |
651 | check = head; |
| 651 | |
652 | |
| … | |
… | |
| 671 | if (at->randomitems && !at_spell) |
672 | if (at->randomitems && !at_spell) |
| 672 | create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0); |
673 | create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0); |
| 673 | } |
674 | } |
| 674 | |
675 | |
| 675 | /* free the one we used to copy */ |
676 | /* free the one we used to copy */ |
| 676 | tmp->destroy (); |
677 | tmp->destroy (true); |
| 677 | } |
678 | } |
| 678 | |
679 | |
| 679 | return 1; |
680 | return 1; |
| 680 | } |
681 | } |
| 681 | |
682 | |
| … | |
… | |
| 815 | dm_stack_pop (op->contr); |
816 | dm_stack_pop (op->contr); |
| 816 | |
817 | |
| 817 | if (tmp->head) |
818 | if (tmp->head) |
| 818 | tmp = tmp->head; |
819 | tmp = tmp->head; |
| 819 | |
820 | |
| 820 | tmp->destroy (); |
821 | tmp->destroy (true); |
| 821 | return 1; |
822 | return 1; |
| 822 | } |
823 | } |
| 823 | |
824 | |
| 824 | /** |
825 | /** |
| 825 | * This adds exp to a player. We now allow adding to a specific skill. |
826 | * This adds exp to a player. We now allow adding to a specific skill. |
| … | |
… | |
| 1219 | new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); |
1220 | new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); |
| 1220 | return 0; |
1221 | return 0; |
| 1221 | } |
1222 | } |
| 1222 | |
1223 | |
| 1223 | do_learn_spell (op, tmp, special_prayer); |
1224 | do_learn_spell (op, tmp, special_prayer); |
| 1224 | tmp->destroy (); |
1225 | tmp->destroy (true); |
| 1225 | return 1; |
1226 | return 1; |
| 1226 | } |
1227 | } |
| 1227 | |
1228 | |
| 1228 | int |
1229 | int |
| 1229 | command_learn_spell (object *op, char *params) |
1230 | command_learn_spell (object *op, char *params) |
