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.22 by root, Sat Jan 27 02:19:37 2007 UTC vs.
Revision 1.25 by root, Mon Jun 4 13:04:00 2007 UTC

… …
26#include <random_map.h> 26#include <random_map.h>
27#include <dirent.h> 27#include <dirent.h>
28#include <sys/stat.h> 28#include <sys/stat.h>
29#include <unistd.h> 29#include <unistd.h>
30#include "../include/autoconf.h" 30#include "../include/autoconf.h"
31
32// NAME_MAX may not be defined on POSIX systems
33#ifndef NAME_MAX
34# define NAME_MAX 255
35#endif
31 36
32static int 37static int
33pointer_strcmp (const void *p1, const void *p2) 38pointer_strcmp (const void *p1, const void *p2)
34{ 39{
35 const char *s1 = *(const char **) p1; 40 const char *s1 = *(const char **) p1;
… …
60 int entries = 0, entry_size = 0; 65 int entries = 0, entry_size = 0;
61 char name[NAME_MAX + 1], **rn = NULL; 66 char name[NAME_MAX + 1], **rn = NULL;
62 struct stat sb; 67 struct stat sb;
63 68
64 dp = opendir (dir); 69 dp = opendir (dir);
65 if (dp == NULL) 70 if (!dp)
66 return -1; 71 return -1;
67 72
68 while ((d = readdir (dp)) != NULL) 73 while ((d = readdir (dp)))
69 { 74 {
70 sprintf (name, "%s/%s", dir, d->d_name); 75 sprintf (name, "%s/%s", dir, d->d_name);
71 if (skip_dirs) 76 if (skip_dirs)
72 { 77 {
73 stat (name, &sb); 78 stat (name, &sb);
74 if (S_ISDIR (sb.st_mode)) 79 if (S_ISDIR (sb.st_mode))
75 {
76 continue; 80 continue;
77 }
78 } 81 }
79 82
80 if (entries == entry_size) 83 if (entries == entry_size)
81 { 84 {
82 entry_size += 10; 85 entry_size += 10;
… …
108 sprintf (style_file_path, "%s/%s", dirname, stylename); 111 sprintf (style_file_path, "%s/%s", dirname, stylename);
109 else /* otherwise, just use the dirname. We'll pick a random stylefile. */ 112 else /* otherwise, just use the dirname. We'll pick a random stylefile. */
110 sprintf (style_file_path, "%s", dirname); 113 sprintf (style_file_path, "%s", dirname);
111 114
112 /* is what we were given a directory, or a file? */ 115 /* is what we were given a directory, or a file? */
113 sprintf (style_file_full_path, "%s/maps%s", settings.datadir, style_file_path); 116 sprintf (style_file_full_path, "%s/maps%s.map", settings.datadir, style_file_path);
114 117
115 if (stat (style_file_full_path, &file_stat) == 0 && !S_ISDIR (file_stat.st_mode)) 118 if (stat (style_file_full_path, &file_stat) == 0 && !S_ISDIR (file_stat.st_mode))
116 style_map = maptile::find_sync (style_file_path); 119 style_map = maptile::find_sync (style_file_path);
117 120
118 if (!style_map) /* maybe we were given a directory! */ 121 if (!style_map) /* maybe we were given a directory! */
… …
203 style_map->load_sync (); 206 style_map->load_sync ();
204 style_map->deactivate (); 207 style_map->deactivate ();
205 } 208 }
206 209
207 return style_map; 210 return style_map;
208
209} 211}
210
211/* picks a random object from a style map.
212 * Redone by MSW so it should be faster and not use static
213 * variables to generate tables.
214 */
215object *
216pick_random_object (maptile *style)
217{
218 /* while returning a null object will result in a crash, that
219 * is actually preferable to an infinite loop. That is because
220 * most servers will automatically restart in case of crash.
221 * Change the logic on getting the random space - shouldn't make
222 * any difference, but this seems clearer to me.
223 */
224 for (int i = 1000; --i;)
225 {
226 object *new_obj = style->at (rndm (style->width), rndm (style->height)).bot;
227
228 if (new_obj)
229 return new_obj->head_ ();
230 }
231
232 // instead of crashing in the unlikely case, try to return *something*
233 return get_archetype ("blocked");
234}

Diff Legend

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