| version 1.88 | | version 1.89 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_map_c = | | * static char *rcsid_map_c = |
| * "$Id: map.c,v 1.88 2005/10/16 22:51:21 qal21 Exp $"; | | * "$Id: map.c,v 1.89 2005/10/28 19:08:53 akirschbaum Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| static shopitems *parse_shop_string (const char *input_string) { | | static shopitems *parse_shop_string (const char *input_string) { |
| char *shop_string, *p, *q, *next_semicolon, *next_colon; | | char *shop_string, *p, *q, *next_semicolon, *next_colon; |
| shopitems *items=NULL; | | shopitems *items=NULL; |
| int strength=0, i=0, number_of_entries=0; | | int i=0, number_of_entries=0; |
| const typedata *current_type; | | const typedata *current_type; |
| | | |
| shop_string=strdup_local(input_string); | | shop_string=strdup_local(input_string); |
| | |
| static void print_shop_string(mapstruct *m, char *output_string) { | | static void print_shop_string(mapstruct *m, char *output_string) { |
| int i; | | int i; |
| char tmp[MAX_BUF]; | | char tmp[MAX_BUF]; |
| sprintf(output_string, "\0"); | | strcpy(output_string, ""); |
| for (i=0; i< m->shopitems[0].index; i++) { | | for (i=0; i< m->shopitems[0].index; i++) { |
| if (m->shopitems[i].typenum) { | | if (m->shopitems[i].typenum) { |
| if (m->shopitems[i].strength) { | | if (m->shopitems[i].strength) { |
| | |
| fprintf(fp,"shopitems %s\n", shop); | | fprintf(fp,"shopitems %s\n", shop); |
| } | | } |
| if (m->shopgreed) fprintf(fp,"shopgreed %f\n", m->shopgreed); | | if (m->shopgreed) fprintf(fp,"shopgreed %f\n", m->shopgreed); |
| if (m->shopmin) fprintf(fp,"shopmin %d\n", m->shopmin); | | #ifndef WIN32 |
| if (m->shopmax) fprintf(fp,"shopmax %d\n", m->shopmax); | | if (m->shopmin) fprintf(fp,"shopmin %llu\n", m->shopmin); |
| | | if (m->shopmax) fprintf(fp,"shopmax %llu\n", m->shopmax); |
| | | #else |
| | | if (m->shopmin) fprintf(fp,"shopmin %I64u\n", m->shopmin); |
| | | if (m->shopmax) fprintf(fp,"shopmax %I64u\n", m->shopmax); |
| | | #endif |
| if (m->shoprace) fprintf(fp,"shoprace %s\n", m->shoprace); | | if (m->shoprace) fprintf(fp,"shoprace %s\n", m->shoprace); |
| if (m->darkness) fprintf(fp,"darkness %d\n", m->darkness); | | if (m->darkness) fprintf(fp,"darkness %d\n", m->darkness); |
| if (m->width) fprintf(fp,"width %d\n", m->width); | | if (m->width) fprintf(fp,"width %d\n", m->width); |
| | |
| top=blank_face; | | top=blank_face; |
| floor=blank_face; | | floor=blank_face; |
| | | |
| | | middle_obj = NULL; |
| | | top_obj = NULL; |
| | | floor_obj = NULL; |
| | | |
| for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) { | | for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) { |
| | | |
| /* This could be made additive I guess (two lights better than | | /* This could be made additive I guess (two lights better than |