1 | |
|
|
2 | /* |
1 | /* |
3 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
4 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
5 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
7 | |
7 | * |
8 | 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 |
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 2 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, write to the Free Software |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | |
21 | * |
22 | 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> |
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> |
… | |
… | |
148 | if (only_subdirs) |
148 | if (only_subdirs) |
149 | style_map = 0; |
149 | style_map = 0; |
150 | else |
150 | else |
151 | { |
151 | { |
152 | strcat (style_file_path, "/"); |
152 | strcat (style_file_path, "/"); |
153 | strcat (style_file_path, namelist[RANDOM () % n]); |
153 | strcat (style_file_path, namelist[rndm (n)]); |
154 | style_map = maptile::find_sync (style_file_path); |
154 | style_map = maptile::find_sync (style_file_path); |
155 | } |
155 | } |
156 | } |
156 | } |
157 | else |
157 | else |
158 | { /* find the map closest in difficulty */ |
158 | { /* find the map closest in difficulty */ |
… | |
… | |
166 | if ((mfile_name - 1) == NULL) |
166 | if ((mfile_name - 1) == NULL) |
167 | { /* since there isn't a sequence, */ |
167 | { /* since there isn't a sequence, */ |
168 | int q; |
168 | int q; |
169 | |
169 | |
170 | /*pick one at random to recurse */ |
170 | /*pick one at random to recurse */ |
171 | style_map = find_style (style_file_path, namelist[RANDOM () % n], difficulty); |
171 | style_map = find_style (style_file_path, namelist[rndm (n)], difficulty); |
172 | for (q = 0; q < n; q++) |
172 | for (q = 0; q < n; q++) |
173 | free (namelist[q]); |
173 | free (namelist[q]); |
174 | free (namelist); |
174 | free (namelist); |
175 | return style_map; |
175 | return style_map; |
176 | } |
176 | } |
… | |
… | |
221 | * Change the logic on getting the random space - shouldn't make |
221 | * Change the logic on getting the random space - shouldn't make |
222 | * any difference, but this seems clearer to me. |
222 | * any difference, but this seems clearer to me. |
223 | */ |
223 | */ |
224 | for (int i = 1000; --i;) |
224 | for (int i = 1000; --i;) |
225 | { |
225 | { |
226 | object *new_obj = style->at (RANDOM () % style->width, RANDOM () % style->height).bot; |
226 | object *new_obj = style->at (rndm (style->width), rndm (style->height)).bot; |
227 | |
227 | |
228 | if (new_obj) |
228 | if (new_obj) |
229 | return new_obj->head_ (); |
229 | return new_obj->head_ (); |
230 | } |
230 | } |
231 | |
231 | |