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.13 by root, Sun Dec 31 10:28:36 2006 UTC vs.
Revision 1.23 by root, Wed Feb 14 01:33:24 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23
24 24
25#include <global.h> 25#include <global.h>
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 31
33static int 32static int
34pointer_strcmp (const void *p1, const void *p2) 33pointer_strcmp (const void *p1, const void *p2)
35{ 34{
36 const char *s1 = *(const char **) p1; 35 const char *s1 = *(const char **) p1;
… …
61 int entries = 0, entry_size = 0; 60 int entries = 0, entry_size = 0;
62 char name[NAME_MAX + 1], **rn = NULL; 61 char name[NAME_MAX + 1], **rn = NULL;
63 struct stat sb; 62 struct stat sb;
64 63
65 dp = opendir (dir); 64 dp = opendir (dir);
66 if (dp == NULL) 65 if (!dp)
67 return -1; 66 return -1;
68 67
69 while ((d = readdir (dp)) != NULL) 68 while ((d = readdir (dp)))
70 { 69 {
71 sprintf (name, "%s/%s", dir, d->d_name); 70 sprintf (name, "%s/%s", dir, d->d_name);
72 if (skip_dirs) 71 if (skip_dirs)
73 { 72 {
74 stat (name, &sb); 73 stat (name, &sb);
75 if (S_ISDIR (sb.st_mode)) 74 if (S_ISDIR (sb.st_mode))
76 {
77 continue; 75 continue;
78 }
79 } 76 }
80 77
81 if (entries == entry_size) 78 if (entries == entry_size)
82 { 79 {
83 entry_size += 10; 80 entry_size += 10;
… …
96} 93}
97 94
98maptile * 95maptile *
99find_style (const char *dirname, const char *stylename, int difficulty) 96find_style (const char *dirname, const char *stylename, int difficulty)
100{ 97{
101 char style_file_path[256]; 98 char style_file_path[1024];
102 char style_file_full_path[256]; 99 char style_file_full_path[1024];
103 maptile *style_map = NULL; 100 maptile *style_map = NULL;
104 struct stat file_stat; 101 struct stat file_stat;
105 int i, only_subdirs = 0; 102 int i, only_subdirs = 0;
106 103
107 /* if stylename exists, set style_file_path to that file. */ 104 /* if stylename exists, set style_file_path to that file. */
… …
109 sprintf (style_file_path, "%s/%s", dirname, stylename); 106 sprintf (style_file_path, "%s/%s", dirname, stylename);
110 else /* otherwise, just use the dirname. We'll pick a random stylefile. */ 107 else /* otherwise, just use the dirname. We'll pick a random stylefile. */
111 sprintf (style_file_path, "%s", dirname); 108 sprintf (style_file_path, "%s", dirname);
112 109
113 /* is what we were given a directory, or a file? */ 110 /* is what we were given a directory, or a file? */
114 sprintf (style_file_full_path, "%s/maps%s", settings.datadir, style_file_path); 111 sprintf (style_file_full_path, "%s/maps%s.map", settings.datadir, style_file_path);
112
115 if (stat (style_file_full_path, &file_stat) == 0 && !S_ISDIR (file_stat.st_mode)) 113 if (stat (style_file_full_path, &file_stat) == 0 && !S_ISDIR (file_stat.st_mode))
116 style_map = maptile::load_map_sync (style_file_path); 114 style_map = maptile::find_sync (style_file_path);
117 115
118 if (!style_map) /* maybe we were given a directory! */ 116 if (!style_map) /* maybe we were given a directory! */
119 { 117 {
120 char **namelist; 118 char **namelist;
121 int n; 119 int n;
122 char style_dir_full_path[256]; 120 char style_dir_full_path[256];
123 121
… …
148 if (only_subdirs) 146 if (only_subdirs)
149 style_map = 0; 147 style_map = 0;
150 else 148 else
151 { 149 {
152 strcat (style_file_path, "/"); 150 strcat (style_file_path, "/");
153 strcat (style_file_path, namelist[RANDOM () % n]); 151 strcat (style_file_path, namelist[rndm (n)]);
154 style_map = maptile::load_map_sync (style_file_path); 152 style_map = maptile::find_sync (style_file_path);
155 } 153 }
156 } 154 }
157 else 155 else
158 { /* find the map closest in difficulty */ 156 { /* find the map closest in difficulty */
159 int min_dist = 32000, min_index = -1; 157 int min_dist = 32000, min_index = -1;
… …
166 if ((mfile_name - 1) == NULL) 164 if ((mfile_name - 1) == NULL)
167 { /* since there isn't a sequence, */ 165 { /* since there isn't a sequence, */
168 int q; 166 int q;
169 167
170 /*pick one at random to recurse */ 168 /*pick one at random to recurse */
171 style_map = find_style (style_file_path, namelist[RANDOM () % n], difficulty); 169 style_map = find_style (style_file_path, namelist[rndm (n)], difficulty);
172 for (q = 0; q < n; q++) 170 for (q = 0; q < n; q++)
173 free (namelist[q]); 171 free (namelist[q]);
174 free (namelist); 172 free (namelist);
175 return style_map; 173 return style_map;
176 } 174 }
… …
182 min_dist = dist; 180 min_dist = dist;
183 min_index = i; 181 min_index = i;
184 } 182 }
185 } 183 }
186 } 184 }
185
187 /* presumably now we've found the "best" match for the 186 /* presumably now we've found the "best" match for the
188 difficulty. */ 187 difficulty. */
189 strcat (style_file_path, "/"); 188 strcat (style_file_path, "/");
190 strcat (style_file_path, namelist[min_index]); 189 strcat (style_file_path, namelist[min_index]);
191 style_map = maptile::load_map_sync (style_file_path); 190 style_map = maptile::find_sync (style_file_path);
192 } 191 }
193 192
194 for (i = 0; i < n; i++) 193 for (i = 0; i < n; i++)
195 free (namelist[i]); 194 free (namelist[i]);
196 195
197 free (namelist); 196 free (namelist);
197 }
198
199 if (style_map)
200 {
201 style_map->load_sync ();
202 style_map->deactivate ();
198 } 203 }
199 204
200 return style_map; 205 return style_map;
201 206
202} 207}
… …
206 * variables to generate tables. 211 * variables to generate tables.
207 */ 212 */
208object * 213object *
209pick_random_object (maptile *style) 214pick_random_object (maptile *style)
210{ 215{
211 int x, y, limit = 0;
212 object *new_obj;
213
214 /* while returning a null object will result in a crash, that 216 /* while returning a null object will result in a crash, that
215 * is actually preferable to an infinite loop. That is because 217 * is actually preferable to an infinite loop. That is because
216 * most servers will automatically restart in case of crash. 218 * most servers will automatically restart in case of crash.
217 * Change the logic on getting the random space - shouldn't make 219 * Change the logic on getting the random space - shouldn't make
218 * any difference, but this seems clearer to me. 220 * any difference, but this seems clearer to me.
219 */ 221 */
220 do 222 for (int i = 1000; --i;)
221 {
222 limit++;
223 x = RANDOM () % style->width;
224 y = RANDOM () % style->height;
225 new_obj = GET_MAP_OB (style, x, y);
226 } 223 {
227 while (new_obj == NULL && limit < 1000); 224 object *new_obj = style->at (rndm (style->width), rndm (style->height)).bot;
228 225
229 if (new_obj->head) 226 if (new_obj)
230 return new_obj->head; 227 return new_obj->head_ ();
231 else 228 }
232 return new_obj;
233}
234 229
230 // instead of crashing in the unlikely case, try to return *something*
231 return get_archetype ("blocked");
232}

Diff Legend

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