| … | |
… | |
| 690 | item = GET_MAP_OB (pl->map, x, y); |
690 | item = GET_MAP_OB (pl->map, x, y); |
| 691 | if (!item) |
691 | if (!item) |
| 692 | { |
692 | { |
| 693 | /* Should not happen with previous tests, but we never know */ |
693 | /* Should not happen with previous tests, but we never know */ |
| 694 | new_draw_info (NDI_UNIQUE, 0, pl, "Invalid square."); |
694 | new_draw_info (NDI_UNIQUE, 0, pl, "Invalid square."); |
| 695 | LOG (llevError, "apply_builder_remove: (null) square at (%d, %d, %s)\n", x, y, pl->map->path); |
695 | LOG (llevError, "apply_builder_remove: (null) square at (%d, %d, %s)\n", x, y, &pl->map->path); |
| 696 | return; |
696 | return; |
| 697 | } |
697 | } |
| 698 | |
698 | |
| 699 | if (item->type == FLOOR || QUERY_FLAG (item, FLAG_IS_FLOOR)) |
699 | if (item->type == FLOOR || QUERY_FLAG (item, FLAG_IS_FLOOR)) |
| 700 | item = item->above; |
700 | item = item->above; |
| … | |
… | |
| 759 | |
759 | |
| 760 | tmp = GET_MAP_OB (pl->map, x, y); |
760 | tmp = GET_MAP_OB (pl->map, x, y); |
| 761 | if (!tmp) |
761 | if (!tmp) |
| 762 | { |
762 | { |
| 763 | /* Nothing, meaning player is standing next to an undefined square... */ |
763 | /* Nothing, meaning player is standing next to an undefined square... */ |
| 764 | LOG (llevError, "apply_map_builder: undefined square at (%d, %d, %s)\n", x, y, pl->map->path); |
764 | LOG (llevError, "apply_map_builder: undefined square at (%d, %d, %s)\n", x, y, &pl->map->path); |
| 765 | new_draw_info (NDI_UNIQUE, 0, pl, "You'd better not build here, it looks weird."); |
765 | new_draw_info (NDI_UNIQUE, 0, pl, "You'd better not build here, it looks weird."); |
| 766 | return; |
766 | return; |
| 767 | } |
767 | } |
| 768 | tmp2 = find_marked_object (pl); |
768 | tmp2 = find_marked_object (pl); |
| 769 | while (tmp) |
769 | while (tmp) |
