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

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.24 by root, Sat Jan 27 02:19:37 2007 UTC vs.
Revision 1.40 by root, Thu May 8 13:47:19 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,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/* placing treasure in maps, where appropriate. */ 24/* placing treasure in maps, where appropriate. */
26 25
27#include <global.h> 26#include <global.h>
… …
46/* a macro to get a strongly centered random distribution, 45/* a macro to get a strongly centered random distribution,
47 from 0 to x, centered at x/2 */ 46 from 0 to x, centered at x/2 */
48static int 47static int
49bc_random (int x) 48bc_random (int x)
50{ 49{
51 return (rndm (x) + rndm (x) + rndm (x)) / 3; 50 return (rmg_rndm (x) + rmg_rndm (x) + rmg_rndm (x)) / 3;
51}
52
53static object *
54gen_key (const shstr &keycode)
55{
56 /* get a key and set its keycode */
57 object *key = archetype::get (shstr_key2);
58
59 key->slaying = keycode;
60 key->stats.food = 100;
61 key->speed_left = -1.f;
62 key->flag [FLAG_IS_USED_UP] = true;
63 key->set_speed (1.f / 300.f);
64
65 return key;
66}
67
68/* places keys in the map, preferably in something alive.
69 keycode is the key's code,
70 door_flag is either PASS_DOORS or NO_PASS_DOORS.
71 NO_PASS_DOORS won't cross doors or walls to keyplace, PASS_DOORS will.
72 if n_keys is 1, it will place 1 key. if n_keys >1, it will place 2-4 keys:
73 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
74
75 The idea is that you call keyplace on x,y where a door is, and it'll make
76 sure a key is placed on both sides of the door.
77*/
78static int
79keyplace (maptile *map, int x, int y, const shstr &keycode, int door_flag, int n_keys, random_map_params *RP)
80{
81 int i, j;
82 int kx = 0, ky = 0;
83 object *the_keymaster; /* the monster that gets the key. */
84 object *the_key = gen_key (keycode);
85
86 if (door_flag == PASS_DOORS)
87 {
88 int tries = 0;
89
90 the_keymaster = 0;
91 while (tries < 15 && !the_keymaster)
92 {
93 i = rmg_rndm (RP->Xsize - 2) + 1;
94 j = rmg_rndm (RP->Ysize - 2) + 1;
95 tries++;
96 the_keymaster = find_closest_monster (map, i, j, RP);
97 }
98
99 /* if we don't find a good keymaster, drop the key on the ground. */
100 if (!the_keymaster)
101 {
102 int freeindex;
103
104 freeindex = -1;
105 for (tries = 0; tries < 15 && freeindex == -1; tries++)
106 {
107 kx = rmg_rndm (RP->Xsize - 2) + 1;
108 ky = rmg_rndm (RP->Ysize - 2) + 1;
109 freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
110 }
111
112 // can freeindex ever be < 0?
113 if (freeindex >= 0)
114 {
115 kx += freearr_x [freeindex];
116 ky += freearr_y [freeindex];
117 }
118 }
119 }
120 else
121 { /* NO_PASS_DOORS --we have to work harder. */
122 /* don't try to keyplace if we're sitting on a blocked square and
123 NO_PASS_DOORS is set. */
124 if (n_keys == 1)
125 {
126 if (wall_blocked (map, x, y))
127 {
128 the_key->destroy ();
129 return 0;
130 }
131
132 the_keymaster = find_monster_in_room (map, x, y, RP);
133 if (!the_keymaster) /* if fail, find a spot to drop the key. */
134 find_spot_in_room (map, x, y, &kx, &ky, RP);
135 }
136 else
137 {
138 int sum = 0; /* count how many keys we actually place */
139
140 /* I'm lazy, so just try to place in all 4 directions. */
141 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
142 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
143 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
144 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
145
146 if (sum < 2) /* we might have made a disconnected map-place more keys. */
147 { /* diagonally this time. */
148 keyplace (map, x + 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
149 keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
150 keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
151 keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
152 }
153
154 the_key->destroy ();
155 return 1;
156 }
157 }
158
159 if (the_keymaster)
160 the_keymaster->head_ ()->insert (the_key);
161 else
162 {
163 the_key->x = kx;
164 the_key->y = ky;
165 insert_ob_in_map (the_key, map, NULL, 0);
166 }
167
168 return 1;
52} 169}
53 170
54/* returns true if square x,y has P_NO_PASS set, which is true for walls 171/* returns true if square x,y has P_NO_PASS set, which is true for walls
55 * and doors but not monsters. 172 * and doors but not monsters.
56 * This function is not map tile aware. 173 * This function is not map tile aware.
… …
59wall_blocked (maptile *m, int x, int y) 176wall_blocked (maptile *m, int x, int y)
60{ 177{
61 if (OUT_OF_REAL_MAP (m, x, y)) 178 if (OUT_OF_REAL_MAP (m, x, y))
62 return 1; 179 return 1;
63 180
181 m->at (x, y).update ();
64 int r = GET_MAP_MOVE_BLOCK (m, x, y) & ~MOVE_BLOCK_DEFAULT; 182 return GET_MAP_MOVE_BLOCK (m, x, y) & MOVE_WALK;
65 return r;
66} 183}
67 184
68/* place treasures in the map, given the 185/* place treasures in the map, given the
69map, (required) 186map, (required)
70layout, (required) 187layout, (required)
… …
83 if (treasure_style) 200 if (treasure_style)
84 if (!strcmp (treasure_style, "none")) 201 if (!strcmp (treasure_style, "none"))
85 return; 202 return;
86 203
87 if (treasureoptions <= 0) 204 if (treasureoptions <= 0)
88 treasureoptions = rndm (2 * LAST_OPTION); 205 treasureoptions = rmg_rndm (2 * LAST_OPTION);
89 206
90 /* filter out the mutually exclusive options */ 207 /* filter out the mutually exclusive options */
91 if ((treasureoptions & RICH) && (treasureoptions & SPARSE)) 208 if ((treasureoptions & RICH) && (treasureoptions & SPARSE))
92 { 209 {
93 if (rndm (2)) 210 if (rmg_rndm (2))
94 treasureoptions -= 1; 211 treasureoptions -= 1;
95 else 212 else
96 treasureoptions -= 2; 213 treasureoptions -= 2;
97 } 214 }
98 215
… …
119 } 236 }
120 237
121 /* all the treasure at one spot in the map. */ 238 /* all the treasure at one spot in the map. */
122 if (treasureoptions & CONCENTRATED) 239 if (treasureoptions & CONCENTRATED)
123 { 240 {
124
125 /* map_layout_style global, and is previously set */ 241 /* map_layout_style global, and is previously set */
126 switch (RP->map_layout_style) 242 switch (RP->map_layout_style)
127 { 243 {
128 case LAYOUT_ONION: 244 case LAYOUT_ONION:
129 case LAYOUT_SPIRAL: 245 case LAYOUT_SPIRAL:
… …
137 for (j = 0; j < RP->Ysize; j++) 253 for (j = 0; j < RP->Ysize; j++)
138 { 254 {
139 if (layout[i][j] == 'C' || layout[i][j] == '>') 255 if (layout[i][j] == 'C' || layout[i][j] == '>')
140 { 256 {
141 int tdiv = RP->symmetry_used; 257 int tdiv = RP->symmetry_used;
142 object **doorlist;
143 object *chest; 258 object *chest;
144 259
145 if (tdiv == 3) 260 if (tdiv == 3)
146 tdiv = 2; /* this symmetry uses a divisor of 2 */ 261 tdiv = 2; /* this symmetry uses a divisor of 2 */
262
147 /* don't put a chest on an exit. */ 263 /* don't put a chest on an exit. */
148 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures / tdiv, RP); 264 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures / tdiv, RP);
265
149 if (!chest) 266 if (!chest)
150 continue; /* if no chest was placed NEXT */ 267 continue; /* if no chest was placed NEXT */
268
151 if (treasureoptions & (DOORED | HIDDEN)) 269 if (treasureoptions & (DOORED | HIDDEN))
152 { 270 {
153 doorlist = find_doors_in_room (map, i, j, RP); 271 object **doorlist = find_doors_in_room (map, i, j, RP);
154 lock_and_hide_doors (doorlist, map, treasureoptions, RP); 272 lock_and_hide_doors (doorlist, map, treasureoptions, RP);
155 free (doorlist); 273 free (doorlist);
156 } 274 }
157 } 275 }
158 } 276 }
159 } 277 }
160 break; 278 break;
161 } 279 }
280
162 default: 281 default:
163 { 282 {
164 int i, j, tries; 283 int i, j, tries;
165 object *chest; 284 object *chest;
166 object **doorlist; 285 object **doorlist;
167 286
168 i = j = -1; 287 i = j = -1;
169 tries = 0; 288 tries = 0;
170 while (i == -1 && tries < 100) 289 while (i == -1 && tries < 100)
171 { 290 {
172 i = rndm (RP->Xsize - 2) + 1; 291 i = rmg_rndm (RP->Xsize - 2) + 1;
173 j = rndm (RP->Ysize - 2) + 1; 292 j = rmg_rndm (RP->Ysize - 2) + 1;
174 find_enclosed_spot (map, &i, &j, RP); 293 find_enclosed_spot (map, &i, &j, RP);
294
175 if (wall_blocked (map, i, j)) 295 if (wall_blocked (map, i, j))
176 i = -1; 296 i = -1;
297
177 tries++; 298 tries++;
178 } 299 }
300
179 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures, RP); 301 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures, RP);
302
180 if (!chest) 303 if (!chest)
181 return; 304 return;
305
182 i = chest->x; 306 i = chest->x;
183 j = chest->y; 307 j = chest->y;
184 if (treasureoptions & (DOORED | HIDDEN)) 308 if (treasureoptions & (DOORED | HIDDEN))
185 { 309 {
186 doorlist = surround_by_doors (map, layout, i, j, treasureoptions); 310 doorlist = surround_by_doors (map, layout, i, j, treasureoptions);
… …
194 { /* DIFFUSE treasure layout */ 318 { /* DIFFUSE treasure layout */
195 int ti, i, j; 319 int ti, i, j;
196 320
197 for (ti = 0; ti < num_treasures; ti++) 321 for (ti = 0; ti < num_treasures; ti++)
198 { 322 {
199 i = rndm (RP->Xsize - 2) + 1; 323 i = rmg_rndm (RP->Xsize - 2) + 1;
200 j = rndm (RP->Ysize - 2) + 1; 324 j = rmg_rndm (RP->Ysize - 2) + 1;
201 place_chest (treasureoptions, i, j, map, style_map, 1, RP); 325 place_chest (treasureoptions, i, j, map, style_map, 1, RP);
202 } 326 }
203 } 327 }
204} 328}
205 329
206/* put a chest into the map, near x and y, with the treasure style 330/* put a chest into the map, near x and y, with the treasure style
207 determined (may be null, or may be a treasure list from lib/treasures, 331 determined (may be null, or may be a treasure list from lib/treasures,
208 if the global variable "treasurestyle" is set to that treasure list's name */ 332 if the global variable "treasurestyle" is set to that treasure list's name */
209
210object * 333object *
211place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP) 334place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP)
212{ 335{
213 object *the_chest;
214 int i, xl, yl;
215
216 the_chest = get_archetype ("chest"); /* was "chest_2" */ 336 object *the_chest = archetype::get (shstr_chest); /* was "chest_2" */
217 337
218 /* first, find a place to put the chest. */ 338 /* first, find a place to put the chest. */
219 i = find_first_free_spot (the_chest, map, x, y); 339 int i = find_first_free_spot (the_chest, map, x, y); // this call uses the main rng
220 if (i == -1) 340 if (i == -1)
221 { 341 {
222 the_chest->destroy (); 342 the_chest->destroy ();
223 return NULL; 343 return NULL;
224 } 344 }
225 345
226 xl = x + freearr_x[i]; 346 int xl = x + freearr_x[i];
227 yl = y + freearr_y[i]; 347 int yl = y + freearr_y[i];
228 348
229 /* if the placement is blocked, return a fail. */ 349 /* if the placement is blocked, return a fail. */
230 if (wall_blocked (map, xl, yl)) 350 if (wall_blocked (map, xl, yl))
231 return 0; 351 return 0;
232 352
… …
239 treasurelist *tlist = find_treasurelist (RP->treasurestyle); 359 treasurelist *tlist = find_treasurelist (RP->treasurestyle);
240 360
241 if (tlist != NULL) 361 if (tlist != NULL)
242 for (ti = 0; ti < n_treasures; ti++) 362 for (ti = 0; ti < n_treasures; ti++)
243 { /* use the treasure list */ 363 { /* use the treasure list */
244 object *new_treasure = pick_random_object (style_map); 364 object *new_treasure = style_map->pick_random_object (rmg_rndm);
245 365
246 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest); 366 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest);
247 } 367 }
248 else 368 else
249 { /* use the style map */ 369 { /* use the style map */
250 the_chest->randomitems = tlist; 370 the_chest->randomitems = tlist;
251 the_chest->stats.hp = n_treasures; 371 the_chest->stats.hp = n_treasures;
252 } 372 }
253#endif 373#endif
254 { /* neither style_map no treasure list given */ 374 { /* neither style_map no treasure list given */
255 treasurelist *tlist = find_treasurelist ("chest"); 375 treasurelist *tlist = treasurelist::find ("chest");
256 376
257 the_chest->randomitems = tlist; 377 the_chest->randomitems = tlist;
258 the_chest->stats.hp = n_treasures; 378 the_chest->stats.hp = n_treasures;
259 } 379 }
260 380
261 /* stick a trap in the chest if required */ 381 /* stick a trap in the chest if required */
262 if (treasureoptions & TRAPPED) 382 if (treasureoptions & TRAPPED)
263 { 383 {
264 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1); 384 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1);
265 object *the_trap;
266 385
267 if (trap_map) 386 if (trap_map)
268 { 387 {
269 the_trap = pick_random_object (trap_map); 388 object *the_trap = trap_map->pick_random_object (rmg_rndm);
389
270 the_trap->stats.Cha = 10 + RP->difficulty; 390 the_trap->stats.Cha = 10 + RP->difficulty;
271 the_trap->level = bc_random ((3 * RP->difficulty) / 2); 391 the_trap->level = bc_random ((3 * RP->difficulty) / 2);
392
272 if (the_trap) 393 if (the_trap)
273 { 394 {
274 object *new_trap; 395 object *new_trap = the_trap->arch->instance ();//TODO: why not clone?
275 396
276 new_trap = arch_to_object (the_trap->arch);
277 new_trap->copy_to (the_trap);
278 new_trap->x = x; 397 new_trap->x = x;
279 new_trap->y = y; 398 new_trap->y = y;
280 insert_ob_in_ob (new_trap, the_chest); 399 insert_ob_in_ob (new_trap, the_chest);
281 } 400 }
282 } 401 }
… …
285 /* set the chest lock code, and call the keyplacer routine with 404 /* set the chest lock code, and call the keyplacer routine with
286 the lockcode. It's not worth bothering to lock the chest if 405 the lockcode. It's not worth bothering to lock the chest if
287 there's only 1 treasure.... */ 406 there's only 1 treasure.... */
288 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1) 407 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1)
289 { 408 {
290 char keybuf[1024]; 409 the_chest->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
291
292 sprintf (keybuf, "%d", rndm (1000000000));
293 the_chest->slaying = keybuf;
294 keyplace (map, x, y, keybuf, PASS_DOORS, 1, RP); 410 keyplace (map, x, y, the_chest->slaying, PASS_DOORS, 1, RP);
295 } 411 }
296 412
297 /* actually place the chest. */ 413 /* actually place the chest. */
298 the_chest->x = xl; 414 the_chest->x = xl;
299 the_chest->y = yl; 415 the_chest->y = yl;
… …
328 } 444 }
329 } 445 }
330 return NULL; 446 return NULL;
331} 447}
332 448
333
334
335/* places keys in the map, preferably in something alive.
336 keycode is the key's code,
337 door_flag is either PASS_DOORS or NO_PASS_DOORS.
338 NO_PASS_DOORS won't cross doors or walls to keyplace, PASS_DOORS will.
339 if n_keys is 1, it will place 1 key. if n_keys >1, it will place 2-4 keys:
340 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
341
342 The idea is that you call keyplace on x,y where a door is, and it'll make
343 sure a key is placed on both sides of the door.
344*/
345int
346keyplace (maptile *map, int x, int y, char *keycode, int door_flag, int n_keys, random_map_params *RP)
347{
348 int i, j;
349 int kx = 0, ky = 0;
350 object *the_keymaster; /* the monster that gets the key. */
351 object *the_key;
352
353 /* get a key and set its keycode */
354 the_key = get_archetype ("key2");
355 the_key->slaying = keycode;
356
357 if (door_flag == PASS_DOORS)
358 {
359 int tries = 0;
360
361 the_keymaster = 0;
362 while (tries < 15 && !the_keymaster)
363 {
364 i = rndm (RP->Xsize - 2) + 1;
365 j = rndm (RP->Ysize - 2) + 1;
366 tries++;
367 the_keymaster = find_closest_monster (map, i, j, RP);
368 }
369
370 /* if we don't find a good keymaster, drop the key on the ground. */
371 if (!the_keymaster)
372 {
373 int freeindex;
374
375 freeindex = -1;
376 for (tries = 0; tries < 15 && freeindex == -1; tries++)
377 {
378 kx = rndm (RP->Xsize - 2) + 1;
379 ky = rndm (RP->Ysize - 2) + 1;
380 freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
381 }
382
383 // can freeindex ever be < 0?
384 if (freeindex >= 0)
385 {
386 kx += freearr_x [freeindex];
387 ky += freearr_y [freeindex];
388 }
389 }
390 }
391 else
392 { /* NO_PASS_DOORS --we have to work harder. */
393 /* don't try to keyplace if we're sitting on a blocked square and
394 NO_PASS_DOORS is set. */
395 if (n_keys == 1)
396 {
397 if (wall_blocked (map, x, y))
398 return 0;
399
400 the_keymaster = find_monster_in_room (map, x, y, RP);
401 if (!the_keymaster) /* if fail, find a spot to drop the key. */
402 find_spot_in_room (map, x, y, &kx, &ky, RP);
403 }
404 else
405 {
406 int sum = 0; /* count how many keys we actually place */
407
408 /* I'm lazy, so just try to place in all 4 directions. */
409 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
410 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
411 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
412 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
413
414 if (sum < 2) /* we might have made a disconnected map-place more keys. */
415 { /* diagonally this time. */
416 keyplace (map, x + 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
417 keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
418 keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
419 keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
420 }
421
422 return 1;
423 }
424 }
425
426 if (!the_keymaster)
427 {
428 the_key->x = kx;
429 the_key->y = ky;
430 insert_ob_in_map (the_key, map, NULL, 0);
431 return 1;
432 }
433
434 insert_ob_in_ob (the_key, the_keymaster);
435 return 1;
436}
437
438
439
440/* both find_monster_in_room routines need to have access to this. */ 449/* both find_monster_in_room routines need to have access to this. */
441 450
442object *theMonsterToFind; 451object *theMonsterToFind;
443 452
444/* a recursive routine which will return a monster, eventually,if there is one. 453/* a recursive routine which will return a monster, eventually,if there is one.
… …
476 return theMonsterToFind; 485 return theMonsterToFind;
477 } 486 }
478 } 487 }
479 488
480 /* now search all the 8 squares around recursively for a monster,in random order */ 489 /* now search all the 8 squares around recursively for a monster,in random order */
481 for (i = rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 490 for (i = rmg_rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
482 { 491 {
483 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 492 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
484 if (theMonsterToFind != NULL) 493 if (theMonsterToFind != NULL)
485 return theMonsterToFind; 494 return theMonsterToFind;
486 } 495 }
496
487 return theMonsterToFind; 497 return theMonsterToFind;
488} 498}
489
490 499
491/* sets up some data structures: the _recursive form does the 500/* sets up some data structures: the _recursive form does the
492 real work. */ 501 real work. */
493
494object * 502object *
495find_monster_in_room (maptile *map, int x, int y, random_map_params *RP) 503find_monster_in_room (maptile *map, int x, int y, random_map_params *RP)
496{ 504{
497 char **layout2; 505 Layout layout2 (RP);
498 int i, j; 506
507 layout2->clear ();
508
509 /* allocate and copy the layout, converting C to 0. */
510 for (int i = 0; i < layout2->w; i++)
511 for (int j = 0; j < layout2->h; j++)
512 if (wall_blocked (map, i, j))
513 layout2[i][j] = '#';
499 514
500 theMonsterToFind = 0; 515 theMonsterToFind = 0;
501 layout2 = (char **) calloc (sizeof (char *), RP->Xsize);
502 /* allocate and copy the layout, converting C to 0. */
503 for (i = 0; i < RP->Xsize; i++)
504 {
505 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
506 for (j = 0; j < RP->Ysize; j++)
507 {
508 if (wall_blocked (map, i, j))
509 layout2[i][j] = '#';
510 }
511 }
512 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP); 516 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP);
513 517
514 /* deallocate the temp. layout */ 518 layout2.free ();
515 for (i = 0; i < RP->Xsize; i++)
516 {
517 free (layout2[i]);
518 }
519 free (layout2);
520 519
521 return theMonsterToFind; 520 return theMonsterToFind;
522} 521}
523 522
524/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */ 523/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */
… …
549 room_free_spots_x[number_of_free_spots_in_room] = x; 548 room_free_spots_x[number_of_free_spots_in_room] = x;
550 room_free_spots_y[number_of_free_spots_in_room] = y; 549 room_free_spots_y[number_of_free_spots_in_room] = y;
551 number_of_free_spots_in_room++; 550 number_of_free_spots_in_room++;
552 551
553 /* now search all the 8 squares around recursively for free spots,in random order */ 552 /* now search all the 8 squares around recursively for free spots,in random order */
554 for (i = rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 553 for (i = rmg_rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
555 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 554 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
556 555
557} 556}
558 557
559/* find a random non-blocked spot in this room to drop a key. */ 558/* find a random non-blocked spot in this room to drop a key. */
… …
580 /* setup num_free_spots and room_free_spots */ 579 /* setup num_free_spots and room_free_spots */
581 find_spot_in_room_recursive (layout2, x, y, RP); 580 find_spot_in_room_recursive (layout2, x, y, RP);
582 581
583 if (number_of_free_spots_in_room > 0) 582 if (number_of_free_spots_in_room > 0)
584 { 583 {
585 i = rndm (number_of_free_spots_in_room); 584 i = rmg_rndm (number_of_free_spots_in_room);
586 *kx = room_free_spots_x[i]; 585 *kx = room_free_spots_x[i];
587 *ky = room_free_spots_y[i]; 586 *ky = room_free_spots_y[i];
588 } 587 }
589 588
590 /* deallocate the temp. layout */ 589 /* deallocate the temp. layout */
… …
658 *cy = ly; 657 *cy = ly;
659 return; 658 return;
660 } 659 }
661 } 660 }
662 /* give up and return the closest free spot. */ 661 /* give up and return the closest free spot. */
663 i = find_free_spot (&archetype::find ("chest")->clone, map, x, y, 1, SIZEOFFREE1 + 1); 662 i = find_free_spot (archetype::find (shstr_chest), map, x, y, 1, SIZEOFFREE1 + 1);
664 663
665 if (i != -1) 664 if (i != -1)
666 { 665 {
667 *cx = x + freearr_x[i]; 666 *cx = x + freearr_x[i];
668 *cy = y + freearr_y[i]; 667 *cy = y + freearr_y[i];
… …
698 it'll remove any monsters it finds.*/ 697 it'll remove any monsters it finds.*/
699object ** 698object **
700surround_by_doors (maptile *map, char **layout, int x, int y, int opts) 699surround_by_doors (maptile *map, char **layout, int x, int y, int opts)
701{ 700{
702 int i; 701 int i;
703 char *doors[2]; 702 const char *doors[2];
704 object **doorlist; 703 object **doorlist;
705 int ndoors_made = 0; 704 int ndoors_made = 0;
706 doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */ 705 doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */
707 706
708 /* this is a list we pick from, for horizontal and vertical doors */ 707 /* this is a list we pick from, for horizontal and vertical doors */
… …
746 for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above) 745 for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above)
747 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) 746 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
748 return tmp; 747 return tmp;
749 return NULL; 748 return NULL;
750} 749}
751
752 750
753/* the workhorse routine, which finds the doors in a room */ 751/* the workhorse routine, which finds the doors in a room */
754void 752void
755find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, random_map_params *RP) 753find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, random_map_params *RP)
756{ 754{
… …
771 layout[x][y] = 1; 769 layout[x][y] = 1;
772 door = door_in_square (map, x, y); 770 door = door_in_square (map, x, y);
773 if (door) 771 if (door)
774 { 772 {
775 doorlist[*ndoors] = door; 773 doorlist[*ndoors] = door;
774
776 if (*ndoors > 1022) /* eek! out of memory */ 775 if (*ndoors > 1022) /* eek! out of memory */
777 { 776 {
778 LOG (llevError, "find_doors_in_room_recursive:Too many doors for memory allocated!\n"); 777 LOG (llevError, "find_doors_in_room_recursive:Too many doors for memory allocated!\n");
779 return; 778 return;
780 } 779 }
… …
785 else 784 else
786 { 785 {
787 layout[x][y] = 1; 786 layout[x][y] = 1;
788 787
789 /* now search all the 8 squares around recursively for free spots,in random order */ 788 /* now search all the 8 squares around recursively for free spots,in random order */
790 for (i = rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++) 789 for (i = rmg_rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
791 find_doors_in_room_recursive (layout, map, 790 find_doors_in_room_recursive (layout, map,
792 x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], 791 x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1],
793 doorlist, ndoors, RP); 792 doorlist, ndoors, RP);
794 } 793 }
795} 794}
796 795
797/* find a random non-blocked spot in this room to drop a key. */ 796/* find a random non-blocked spot in this room to drop a key. */
798object ** 797object **
799find_doors_in_room (maptile *map, int x, int y, random_map_params *RP) 798find_doors_in_room (maptile *map, int x, int y, random_map_params *RP)
800{ 799{
801 char **layout2;
802 object **doorlist;
803 int i, j; 800 int i, j;
804 int ndoors = 0; 801 int ndoors = 0;
805 802
806 doorlist = (object **) calloc (sizeof (int), 1024); 803 object **doorlist = (object **)calloc (sizeof (int), 1024);
807 804
808 layout2 = (char **) calloc (sizeof (char *), RP->Xsize); 805 LayoutData layout2 (RP->Xsize, RP->Ysize);
806 layout2.clear ();
807
809 /* allocate and copy the layout, converting C to 0. */ 808 /* allocate and copy the layout, converting C to 0. */
810 for (i = 0; i < RP->Xsize; i++) 809 for (i = 0; i < RP->Xsize; i++)
811 {
812 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
813 for (j = 0; j < RP->Ysize; j++) 810 for (j = 0; j < RP->Ysize; j++)
814 { 811 layout2[i][j] = wall_blocked (map, i, j) ? '#' : 0;
815 if (wall_blocked (map, i, j))
816 layout2[i][j] = '#';
817 }
818 }
819 812
820 /* setup num_free_spots and room_free_spots */ 813 /* setup num_free_spots and room_free_spots */
821 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP); 814 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP);
822 815
823 /* deallocate the temp. layout */
824 for (i = 0; i < RP->Xsize; i++)
825 free (layout2[i]);
826
827 free (layout2);
828 return doorlist; 816 return doorlist;
829} 817}
830
831
832 818
833/* locks and/or hides all the doors in doorlist, or does nothing if 819/* locks and/or hides all the doors in doorlist, or does nothing if
834 opts doesn't say to lock/hide doors. */ 820 opts doesn't say to lock/hide doors. */
835
836void 821void
837lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP) 822lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP)
838{ 823{
839 object *door; 824 object *door;
840 int i; 825 int i;
… …
844 if (opts & DOORED) 829 if (opts & DOORED)
845 { 830 {
846 for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++) 831 for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++)
847 { 832 {
848 object *new_door = get_archetype ("locked_door1"); 833 object *new_door = get_archetype ("locked_door1");
849 char keybuf[1024];
850 834
851 door = doorlist[i]; 835 door = doorlist[i];
852 new_door->face = door->face; 836 new_door->face = door->face;
853 new_door->x = door->x; 837 new_door->x = door->x;
854 new_door->y = door->y; 838 new_door->y = door->y;
855 door->remove (); 839 door->remove ();
856 door->destroy (); 840 door->destroy ();
857 doorlist[i] = new_door; 841 doorlist[i] = new_door;
858 insert_ob_in_map (new_door, map, NULL, 0); 842 insert_ob_in_map (new_door, map, NULL, 0);
859 sprintf (keybuf, "%d", rndm (1000000000)); 843 new_door->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
860 new_door->slaying = keybuf;
861 keyplace (map, new_door->x, new_door->y, keybuf, NO_PASS_DOORS, 2, RP); 844 keyplace (map, new_door->x, new_door->y, new_door->slaying, NO_PASS_DOORS, 2, RP);
862 } 845 }
863 } 846 }
864 847
865 /* change the faces of the doors and surrounding walls to hide them. */ 848 /* change the faces of the doors and surrounding walls to hide them. */
866 if (opts & HIDDEN) 849 if (opts & HIDDEN)
… …
875 { 858 {
876 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP); 859 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP);
877 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP); 860 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP);
878 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP); 861 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP);
879 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP); 862 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP);
863
880 door->face = wallface->face; 864 door->face = wallface->face;
865
881 if (!QUERY_FLAG (wallface, FLAG_REMOVED)) 866 if (!QUERY_FLAG (wallface, FLAG_REMOVED))
882 wallface->remove (); 867 wallface->remove ();
868
883 wallface->destroy (); 869 wallface->destroy ();
884 } 870 }
885 } 871 }
886 } 872 }
887} 873}

Diff Legend

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