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

Comparing deliantra/server/random_maps/special.C (file contents):
Revision 1.15 by root, Mon Jan 15 15:54:19 2007 UTC vs.
Revision 1.19 by root, Sat Jan 27 00:56:48 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
4 3 *
5 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
6 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
7 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
8 7 *
9 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
10 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
11 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version. 11 * (at your option) any later version.
13 12 *
14 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,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License for more details. 16 * GNU General Public License for more details.
18 17 *
19 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
20 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
21 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 21 *
23 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>
24*/ 23 */
25 24
26/* Specials in this file: 25/* Specials in this file:
27 included maps */ 26 included maps */
28 27
29#include <global.h> 28#include <global.h>
… …
119 118
120 /* search a bit for a completely free spot. */ 119 /* search a bit for a completely free spot. */
121 for (tries = 0; tries < 20; tries++) 120 for (tries = 0; tries < 20; tries++)
122 { 121 {
123 /* pick a random location in the layout */ 122 /* pick a random location in the layout */
124 i = RANDOM () % (map->width - xsize - 2) + 1; 123 i = rndm (map->width - xsize - 2) + 1;
125 j = RANDOM () % (map->height - ysize - 2) + 1; 124 j = rndm (map->height - ysize - 2) + 1;
126 is_occupied = 0; 125 is_occupied = 0;
127 for (l = i; l < i + xsize; l++) 126 for (l = i; l < i + xsize; l++)
128 for (m = j; m < j + ysize; m++) 127 for (m = j; m < j + ysize; m++)
129 is_occupied |= layout[l][m]; 128 is_occupied |= layout[l][m];
130 if (!is_occupied) 129 if (!is_occupied)
… …
137 if (is_occupied) 136 if (is_occupied)
138 { /* failure, try a relaxed placer. */ 137 { /* failure, try a relaxed placer. */
139 /* pick a random location in the layout */ 138 /* pick a random location in the layout */
140 for (tries = 0; tries < 10; tries++) 139 for (tries = 0; tries < 10; tries++)
141 { 140 {
142 i = RANDOM () % (map->width - xsize - 2) + 1; 141 i = rndm (map->width - xsize - 2) + 1;
143 j = RANDOM () % (map->height - ysize - 2) + 1; 142 j = rndm (map->height - ysize - 2) + 1;
144 is_occupied = 0; 143 is_occupied = 0;
145 for (l = i; l < i + xsize; l++) 144 for (l = i; l < i + xsize; l++)
146 for (m = j; m < j + ysize; m++) 145 for (m = j; m < j + ysize; m++)
147 if (layout[l][m] == 'C' || layout[l][m] == '>' || layout[l][m] == '<') 146 if (layout[l][m] == 'C' || layout[l][m] == '>' || layout[l][m] == '<')
148 is_occupied |= 1; 147 is_occupied |= 1;
… …
159void 158void
160place_fountain_with_specials (maptile *map) 159place_fountain_with_specials (maptile *map)
161{ 160{
162 int ix, iy, i = -1, tries = 0; 161 int ix, iy, i = -1, tries = 0;
163 maptile *fountain_style = find_style ("/styles/misc", "fountains", -1); 162 maptile *fountain_style = find_style ("/styles/misc", "fountains", -1);
163
164 if (!fountain_style)
165 {
166 LOG (llevError, "unabel to load stylemap /styles/misc fountains\n");
167 return;
168 }
169
164 object *fountain = get_archetype ("fountain"); 170 object *fountain = get_archetype ("fountain");
165 object *potion = object::create (); 171 object *potion = object::create ();
166 172
167 pick_random_object (fountain_style)->copy_to (potion); 173 pick_random_object (fountain_style)->copy_to (potion);
168 174
169 while (i < 0 && tries < 10) 175 while (i < 0 && tries < 10)
170 { 176 {
171 ix = RANDOM () % (map->width - 2) + 1; 177 ix = rndm (map->width - 2) + 1;
172 iy = RANDOM () % (map->height - 2) + 1; 178 iy = rndm (map->height - 2) + 1;
173 i = find_free_spot (fountain, map, ix, iy, 1, SIZEOFFREE1 + 1); 179 i = find_free_spot (fountain, map, ix, iy, 1, SIZEOFFREE1 + 1);
174 tries++; 180 tries++;
175 } 181 }
176 182
177 if (i == -1) 183 if (i == -1)
… …
202 int ix, iy, i = -1; 208 int ix, iy, i = -1;
203 char buf[16384], *style, *decor, *mon; 209 char buf[16384], *style, *decor, *mon;
204 maptile *exit_style = find_style ("/styles/misc", "obscure_exits", -1); 210 maptile *exit_style = find_style ("/styles/misc", "obscure_exits", -1);
205 int g_xsize, g_ysize; 211 int g_xsize, g_ysize;
206 212
213 if (!exit_style)
214 {
215 LOG (llevError, "unabel to load stylemap /styles/misc obscure_exits\n");
216 return;
217 }
218
207 object *the_exit = object::create (); 219 object *the_exit = object::create ();
208 220
209 if (!exit_style) 221 if (!exit_style)
210 return; 222 return;
211 223
212 pick_random_object (exit_style)->copy_to (the_exit); 224 pick_random_object (exit_style)->copy_to (the_exit);
213 225
214 while (i < 0) 226 while (i < 0)
215 { 227 {
216 ix = RANDOM () % (map->width - 2) + 1; 228 ix = rndm (map->width - 2) + 1;
217 iy = RANDOM () % (map->height - 2) + 1; 229 iy = rndm (map->height - 2) + 1;
218 i = find_free_spot (the_exit, map, ix, iy, 1, SIZEOFFREE1 + 1); 230 i = find_free_spot (the_exit, map, ix, iy, 1, SIZEOFFREE1 + 1);
219 } 231 }
220 232
221 ix += freearr_x[i]; 233 ix += freearr_x[i];
222 iy += freearr_y[i]; 234 iy += freearr_y[i];
223 the_exit->x = ix; 235 the_exit->x = ix;
224 the_exit->y = iy; 236 the_exit->y = iy;
225 237
226 if (!hole_type) 238 if (!hole_type)
227 hole_type = RANDOM () % NR_OF_HOLE_TYPES + 1; 239 hole_type = rndm (NR_OF_HOLE_TYPES) + 1;
228 240
229 switch (hole_type) 241 switch (hole_type)
230 { 242 {
231 case GLORY_HOLE: /* treasures */ 243 case GLORY_HOLE: /* treasures */
232 { 244 {
233 g_xsize = RANDOM () % 3 + 4 + RP->difficulty / 4; 245 g_xsize = rndm (3) + 4 + RP->difficulty / 4;
234 g_ysize = RANDOM () % 3 + 4 + RP->difficulty / 4; 246 g_ysize = rndm (3) + 4 + RP->difficulty / 4;
235 style = "onion"; 247 style = "onion";
236 decor = "wealth2"; 248 decor = "wealth2";
237 mon = "none"; 249 mon = "none";
238 break; 250 break;
239 } 251 }
240 252
241 case ORC_ZONE: /* hole with orcs in it. */ 253 case ORC_ZONE: /* hole with orcs in it. */
242 { 254 {
243 g_xsize = RANDOM () % 3 + 4 + RP->difficulty / 4; 255 g_xsize = rndm (3) + 4 + RP->difficulty / 4;
244 g_ysize = RANDOM () % 3 + 4 + RP->difficulty / 4; 256 g_ysize = rndm (3) + 4 + RP->difficulty / 4;
245 style = "onion"; 257 style = "onion";
246 decor = "wealth2"; 258 decor = "wealth2";
247 mon = "orc"; 259 mon = "orc";
248 break; 260 break;
249 } 261 }
250 262
251 case MINING_ZONE: /* hole with orcs in it. */ 263 case MINING_ZONE: /* hole with orcs in it. */
252 { 264 {
253 g_xsize = RANDOM () % 9 + 4 + RP->difficulty / 4; 265 g_xsize = rndm (9) + 4 + RP->difficulty / 4;
254 g_ysize = RANDOM () % 9 + 4 + RP->difficulty / 4; 266 g_ysize = rndm (9) + 4 + RP->difficulty / 4;
255 style = "maze"; 267 style = "maze";
256 decor = "minerals2"; 268 decor = "minerals2";
257 mon = "none"; 269 mon = "none";
258 break; 270 break;
259 } 271 }
… …
288{ 300{
289 maptile *special_map; 301 maptile *special_map;
290 int ix, iy; /* map insertion locatons */ 302 int ix, iy; /* map insertion locatons */
291 int special_type; /* type of special to make */ 303 int special_type; /* type of special to make */
292 304
293
294 special_type = RANDOM () % NUM_OF_SPECIAL_TYPES; 305 special_type = rndm (NUM_OF_SPECIAL_TYPES);
306
295 switch (special_type) 307 switch (special_type)
296 { 308 {
297 309 case SPECIAL_SUBMAP:
298 /* includes a special map into the random map being made. */ 310 /* includes a special map into the random map being made. */
299 case SPECIAL_SUBMAP:
300 {
301 special_map = find_style ("/styles/specialmaps", 0, RP->difficulty); 311 special_map = find_style ("/styles/specialmaps", 0, RP->difficulty);
312
302 if (special_map == NULL) 313 if (!special_map)
303 return; 314 return;
304 315
305 if (find_spot_for_submap (map, layout, &ix, &iy, special_map->width, special_map->height)) 316 if (find_spot_for_submap (map, layout, &ix, &iy, special_map->width, special_map->height))
306 include_map_in_map (map, special_map, ix, iy); 317 include_map_in_map (map, special_map, ix, iy);
318
307 break; 319 break;
308 }
309 320
321 case SPECIAL_FOUNTAIN:
310 /* Make a special fountain: an unpickable potion disguised as 322 /* Make a special fountain: an unpickable potion disguised as
311 a fountain, or rather, colocated with a fountain. */ 323 a fountain, or rather, colocated with a fountain. */
312 case SPECIAL_FOUNTAIN:
313 {
314 place_fountain_with_specials (map); 324 place_fountain_with_specials (map);
315 break; 325 break;
316 }
317 326
327 case SPECIAL_EXIT:
318 /* Make an exit to another random map, e.g. a gloryhole. */ 328 /* Make an exit to another random map, e.g. a gloryhole. */
319 case SPECIAL_EXIT:
320 {
321 place_special_exit (map, 0, RP); 329 place_special_exit (map, 0, RP);
322 break; 330 break;
323 }
324 } 331 }
325 332
326} 333}

Diff Legend

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