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.27 by root, Thu Nov 8 19:43:25 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <random_map.h> 25#include <random_map.h>
27#include <dirent.h> 26#include <dirent.h>
28#include <sys/stat.h> 27#include <sys/stat.h>
29#include <unistd.h> 28#include <unistd.h>
30#include "../include/autoconf.h" 29#include "../include/autoconf.h"
30
31// NAME_MAX may not be defined on POSIX systems
32#ifndef NAME_MAX
33# define NAME_MAX 255
34#endif
31 35
32static int 36static int
33pointer_strcmp (const void *p1, const void *p2) 37pointer_strcmp (const void *p1, const void *p2)
34{ 38{
35 const char *s1 = *(const char **) p1; 39 const char *s1 = *(const char **) p1;
… …
60 int entries = 0, entry_size = 0; 64 int entries = 0, entry_size = 0;
61 char name[NAME_MAX + 1], **rn = NULL; 65 char name[NAME_MAX + 1], **rn = NULL;
62 struct stat sb; 66 struct stat sb;
63 67
64 dp = opendir (dir); 68 dp = opendir (dir);
65 if (dp == NULL) 69 if (!dp)
66 return -1; 70 return -1;
67 71
68 while ((d = readdir (dp)) != NULL) 72 while ((d = readdir (dp)))
69 { 73 {
70 sprintf (name, "%s/%s", dir, d->d_name); 74 sprintf (name, "%s/%s", dir, d->d_name);
71 if (skip_dirs) 75 if (skip_dirs)
72 { 76 {
73 stat (name, &sb); 77 stat (name, &sb);
74 if (S_ISDIR (sb.st_mode)) 78 if (S_ISDIR (sb.st_mode))
75 {
76 continue; 79 continue;
77 }
78 } 80 }
79 81
80 if (entries == entry_size) 82 if (entries == entry_size)
81 { 83 {
82 entry_size += 10; 84 entry_size += 10;
… …
108 sprintf (style_file_path, "%s/%s", dirname, stylename); 110 sprintf (style_file_path, "%s/%s", dirname, stylename);
109 else /* otherwise, just use the dirname. We'll pick a random stylefile. */ 111 else /* otherwise, just use the dirname. We'll pick a random stylefile. */
110 sprintf (style_file_path, "%s", dirname); 112 sprintf (style_file_path, "%s", dirname);
111 113
112 /* is what we were given a directory, or a file? */ 114 /* is what we were given a directory, or a file? */
113 sprintf (style_file_full_path, "%s/maps%s", settings.datadir, style_file_path); 115 sprintf (style_file_full_path, "%s/maps%s.map", settings.datadir, style_file_path);
114 116
115 if (stat (style_file_full_path, &file_stat) == 0 && !S_ISDIR (file_stat.st_mode)) 117 if (stat (style_file_full_path, &file_stat) == 0 && !S_ISDIR (file_stat.st_mode))
116 style_map = maptile::find_sync (style_file_path); 118 style_map = maptile::find_sync (style_file_path);
117 119
118 if (!style_map) /* maybe we were given a directory! */ 120 if (!style_map) /* maybe we were given a directory! */
… …
203 style_map->load_sync (); 205 style_map->load_sync ();
204 style_map->deactivate (); 206 style_map->deactivate ();
205 } 207 }
206 208
207 return style_map; 209 return style_map;
208
209} 210}
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