ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/random_maps/style.C
(Generate patch)

Comparing deliantra/server/random_maps/style.C (file contents):
Revision 1.5 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.13 by root, Sun Dec 31 10:28:36 2006 UTC

… …
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
35static int 33static int
36pointer_strcmp (const void *p1, const void *p2) 34pointer_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
94 qsort (rn, entries, sizeof (char *), pointer_strcmp); 92 qsort (rn, entries, sizeof (char *), pointer_strcmp);
95 93
96 *namelist = rn; 94 *namelist = rn;
97 return entries; 95 return entries;
98}
99
100
101
102
103
104/* this function loads and returns the map requested.
105 * dirname, for example, is "/styles/wallstyles", stylename, is,
106 * for example, "castle", difficulty is -1 when difficulty is
107 * irrelevant to the style. If dirname is given, but stylename
108 * isn't, and difficult is -1, it returns a random style map.
109 * Otherwise, it tries to match the difficulty given with a style
110 * file, named style_name_# where # is an integer
111 */
112
113/* remove extern, so visible to command_style_map_info function */
114maptile *styles = NULL;
115
116
117maptile *
118load_style_map (char *style_name)
119{
120 maptile *style_map;
121
122 /* Given a file. See if its in memory */
123 for (style_map = styles; style_map != NULL; style_map = style_map->next)
124 {
125 if (!strcmp (style_name, style_map->path))
126 return style_map;
127 }
128 style_map = load_original_map (style_name, MAP_STYLE);
129 /* Remove it from global list, put it on our local list */
130 if (style_map)
131 {
132 maptile *tmp;
133
134 if (style_map == first_map)
135 first_map = style_map->next;
136 else
137 {
138 for (tmp = first_map; tmp && tmp->next != style_map; tmp = tmp->next);
139 if (tmp)
140 tmp->next = style_map->next;
141 }
142 style_map->next = styles;
143 styles = style_map;
144 }
145 return style_map;
146} 96}
147 97
148maptile * 98maptile *
149find_style (const char *dirname, const char *stylename, int difficulty) 99find_style (const char *dirname, const char *stylename, int difficulty)
150{ 100{
… …
161 sprintf (style_file_path, "%s", dirname); 111 sprintf (style_file_path, "%s", dirname);
162 112
163 /* is what we were given a directory, or a file? */ 113 /* is what we were given a directory, or a file? */
164 sprintf (style_file_full_path, "%s/maps%s", settings.datadir, style_file_path); 114 sprintf (style_file_full_path, "%s/maps%s", settings.datadir, style_file_path);
165 if (stat (style_file_full_path, &file_stat) == 0 && !S_ISDIR (file_stat.st_mode)) 115 if (stat (style_file_full_path, &file_stat) == 0 && !S_ISDIR (file_stat.st_mode))
166 {
167 style_map = load_style_map (style_file_path); 116 style_map = maptile::load_map_sync (style_file_path);
168 } 117
169 if (style_map == NULL) /* maybe we were given a directory! */ 118 if (!style_map) /* maybe we were given a directory! */
170 { 119 {
171 char **namelist; 120 char **namelist;
172 int n; 121 int n;
173 char style_dir_full_path[256]; 122 char style_dir_full_path[256];
174 123
… …
195 * it properly. 144 * it properly.
196 */ 145 */
197 if (difficulty == -1) 146 if (difficulty == -1)
198 { /* pick a random style from this dir. */ 147 { /* pick a random style from this dir. */
199 if (only_subdirs) 148 if (only_subdirs)
200 style_map = NULL; 149 style_map = 0;
201 else 150 else
202 { 151 {
203 strcat (style_file_path, "/"); 152 strcat (style_file_path, "/");
204 strcat (style_file_path, namelist[RANDOM () % n]); 153 strcat (style_file_path, namelist[RANDOM () % n]);
205 style_map = load_style_map (style_file_path); 154 style_map = maptile::load_map_sync (style_file_path);
206 } 155 }
207 } 156 }
208 else 157 else
209 { /* find the map closest in difficulty */ 158 { /* find the map closest in difficulty */
210 int min_dist = 32000, min_index = -1; 159 int min_dist = 32000, min_index = -1;
… …
237 } 186 }
238 /* presumably now we've found the "best" match for the 187 /* presumably now we've found the "best" match for the
239 difficulty. */ 188 difficulty. */
240 strcat (style_file_path, "/"); 189 strcat (style_file_path, "/");
241 strcat (style_file_path, namelist[min_index]); 190 strcat (style_file_path, namelist[min_index]);
242 style_map = load_style_map (style_file_path); 191 style_map = maptile::load_map_sync (style_file_path);
243 } 192 }
193
244 for (i = 0; i < n; i++) 194 for (i = 0; i < n; i++)
245 free (namelist[i]); 195 free (namelist[i]);
196
246 free (namelist); 197 free (namelist);
247 } 198 }
199
248 return style_map; 200 return style_map;
249 201
250} 202}
251
252 203
253/* picks a random object from a style map. 204/* picks a random object from a style map.
254 * Redone by MSW so it should be faster and not use static 205 * Redone by MSW so it should be faster and not use static
255 * variables to generate tables. 206 * variables to generate tables.
256 */ 207 */
… …
267 * any difference, but this seems clearer to me. 218 * any difference, but this seems clearer to me.
268 */ 219 */
269 do 220 do
270 { 221 {
271 limit++; 222 limit++;
272 x = RANDOM () % MAP_WIDTH (style); 223 x = RANDOM () % style->width;
273 y = RANDOM () % MAP_HEIGHT (style); 224 y = RANDOM () % style->height;
274 new_obj = get_map_ob (style, x, y); 225 new_obj = GET_MAP_OB (style, x, y);
275 } 226 }
276 while (new_obj == NULL && limit < 1000); 227 while (new_obj == NULL && limit < 1000);
228
277 if (new_obj->head) 229 if (new_obj->head)
278 return new_obj->head; 230 return new_obj->head;
279 else 231 else
280 return new_obj; 232 return new_obj;
281} 233}
282 234
283
284void
285free_style_maps (void)
286{
287 maptile *next;
288 int style_maps = 0;
289
290 /* delete_map will try to free it from the linked list,
291 * but won't find it, so we need to do it ourselves
292 */
293 while (styles)
294 {
295 next = styles->next;
296 delete_map (styles);
297 styles = next;
298 style_maps++;
299 }
300 LOG (llevDebug, "free_style_maps: Freed %d maps\n", style_maps);
301}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines