| version 1.11 | | version 1.12 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_shop_c = | | * static char *rcsid_shop_c = |
| * "$Id: shop.c,v 1.11 2001/06/07 06:08:23 mwedel Exp $"; | | * "$Id: shop.c,v 1.12 2001/07/14 04:11:18 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| return strcasecmp(s1->item_sort, s2->item_sort); | | return strcasecmp(s1->item_sort, s2->item_sort); |
| } | | } |
| | | |
| void add_shop_item(object *tmp, shopinv *items, int *numitems, int *numallocated) | | static void add_shop_item(object *tmp, shopinv *items, int *numitems, int *numallocated) |
| { | | { |
| char buf[MAX_BUF]; | | char buf[MAX_BUF]; |
| | | |
| | |
| void shop_listing(object *op) | | void shop_listing(object *op) |
| { | | { |
| int i,j,numitems=0,numallocated=0; | | int i,j,numitems=0,numallocated=0; |
| char *map_mark = (char *) malloc(op->map->map_object->x * op->map->map_object->y); | | char *map_mark = (char *) malloc(MAP_SIZE(op->map)); |
| object *stack; | | object *stack; |
| shopinv *items; | | shopinv *items; |
| | | |
| | |
| | | |
| new_draw_info(NDI_UNIQUE, 0, op, "\nThe shop contains:"); | | new_draw_info(NDI_UNIQUE, 0, op, "\nThe shop contains:"); |
| | | |
| memset(map_mark, 0, op->map->map_object->x * op->map->map_object->y); | | memset(map_mark, 0, MAP_SIZE(op->map)); |
| magic_mapping_mark(op, map_mark, 3); | | magic_mapping_mark(op, map_mark, 3); |
| items=malloc(40*sizeof(shopinv)); | | items=malloc(40*sizeof(shopinv)); |
| numallocated=40; | | numallocated=40; |
| | | |
| /* Find all the appropriate items */ | | /* Find all the appropriate items */ |
| for (i=0; i<op->map->map_object->x; i++) { | | for (i=0; i<MAP_WIDTH(op->map); i++) { |
| for (j=0; j<op->map->map_object->y; j++) { | | for (j=0; j<MAP_HEIGHT(op->map); j++) { |
| if (map_mark[i + op->map->map_object->x * j]) { | | if (map_mark[i + MAP_WIDTH(op->map) * j]) { |
| stack =get_map_ob(op->map,i,j); | | stack =get_map_ob(op->map,i,j); |
| | | |
| while (stack) { | | while (stack) { |