| … | |
… | |
| 22 | */ |
22 | */ |
| 23 | |
23 | |
| 24 | |
24 | |
| 25 | #include <global.h> |
25 | #include <global.h> |
| 26 | #include <random_map.h> |
26 | #include <random_map.h> |
| 27 | #ifndef WIN32 /* ---win32 exclude headers */ |
|
|
| 28 | # include <dirent.h> |
27 | #include <dirent.h> |
| 29 | # include <sys/stat.h> |
28 | #include <sys/stat.h> |
| 30 | # include <unistd.h> |
29 | #include <unistd.h> |
| 31 | # include "../include/autoconf.h" |
30 | #include "../include/autoconf.h" |
| 32 | #endif /* win32 */ |
|
|
| 33 | |
31 | |
| 34 | |
32 | |
| 35 | static int |
33 | static int |
| 36 | pointer_strcmp (const void *p1, const void *p2) |
34 | pointer_strcmp (const void *p1, const void *p2) |
| 37 | { |
35 | { |
| … | |
… | |
| 83 | if (entries == entry_size) |
81 | if (entries == entry_size) |
| 84 | { |
82 | { |
| 85 | entry_size += 10; |
83 | entry_size += 10; |
| 86 | rn = (char **) realloc (rn, sizeof (char *) * entry_size); |
84 | rn = (char **) realloc (rn, sizeof (char *) * entry_size); |
| 87 | } |
85 | } |
| 88 | rn[entries] = strdup_local (d->d_name); |
86 | rn[entries] = strdup (d->d_name); |
| 89 | entries++; |
87 | entries++; |
| 90 | |
88 | |
| 91 | } |
89 | } |
| 92 | (void) closedir (dp); |
90 | (void) closedir (dp); |
| 93 | |
91 | |
| … | |
… | |
| 119 | { |
117 | { |
| 120 | maptile *style_map; |
118 | maptile *style_map; |
| 121 | |
119 | |
| 122 | /* Given a file. See if its in memory */ |
120 | /* Given a file. See if its in memory */ |
| 123 | for (style_map = styles; style_map != NULL; style_map = style_map->next) |
121 | for (style_map = styles; style_map != NULL; style_map = style_map->next) |
| 124 | { |
|
|
| 125 | if (!strcmp (style_name, style_map->path)) |
122 | if (!strcmp (style_name, style_map->path)) |
| 126 | return style_map; |
123 | return style_map; |
| 127 | } |
124 | |
| 128 | style_map = load_original_map (style_name, MAP_STYLE); |
125 | style_map = load_original_map (style_name, MAP_STYLE); |
|
|
126 | |
| 129 | /* Remove it from global list, put it on our local list */ |
127 | /* Remove it from global list, put it on our local list */ |
| 130 | if (style_map) |
128 | if (style_map) |
| 131 | { |
129 | { |
| 132 | maptile *tmp; |
130 | maptile *tmp; |
| 133 | |
131 | |
| … | |
… | |
| 137 | { |
135 | { |
| 138 | for (tmp = first_map; tmp && tmp->next != style_map; tmp = tmp->next); |
136 | for (tmp = first_map; tmp && tmp->next != style_map; tmp = tmp->next); |
| 139 | if (tmp) |
137 | if (tmp) |
| 140 | tmp->next = style_map->next; |
138 | tmp->next = style_map->next; |
| 141 | } |
139 | } |
|
|
140 | |
| 142 | style_map->next = styles; |
141 | style_map->next = styles; |
| 143 | styles = style_map; |
142 | styles = style_map; |
| 144 | } |
143 | } |
|
|
144 | |
| 145 | return style_map; |
145 | return style_map; |
| 146 | } |
146 | } |
| 147 | |
147 | |
| 148 | maptile * |
148 | maptile * |
| 149 | find_style (const char *dirname, const char *stylename, int difficulty) |
149 | find_style (const char *dirname, const char *stylename, int difficulty) |
| … | |
… | |
| 267 | * any difference, but this seems clearer to me. |
267 | * any difference, but this seems clearer to me. |
| 268 | */ |
268 | */ |
| 269 | do |
269 | do |
| 270 | { |
270 | { |
| 271 | limit++; |
271 | limit++; |
| 272 | x = RANDOM () % MAP_WIDTH (style); |
272 | x = RANDOM () % style->width; |
| 273 | y = RANDOM () % MAP_HEIGHT (style); |
273 | y = RANDOM () % style->height; |
| 274 | new_obj = get_map_ob (style, x, y); |
274 | new_obj = GET_MAP_OB (style, x, y); |
| 275 | } |
275 | } |
| 276 | while (new_obj == NULL && limit < 1000); |
276 | while (new_obj == NULL && limit < 1000); |
| 277 | if (new_obj->head) |
277 | if (new_obj->head) |
| 278 | return new_obj->head; |
278 | return new_obj->head; |
| 279 | else |
279 | else |
