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.14 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.56 by root, Fri Jul 2 03:40:14 2010 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 3 *
5 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
7 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
8 7 *
9 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
10 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
11 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
12 (at your option) any later version. 11 * 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 Affero GNU General Public License
20 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
21 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
22 21 *
23 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
24*/ 23 */
25 24
26/* placing treasure in maps, where appropriate. */ 25/* placing treasure in maps, where appropriate. */
27
28
29 26
30#include <global.h> 27#include <global.h>
31#include <random_map.h> 28#include <random_map.h>
32#include <rproto.h> 29#include <rproto.h>
33 30
… …
44#define LAST_OPTION 64 /* set this to the last real option, for random */ 41#define LAST_OPTION 64 /* set this to the last real option, for random */
45 42
46#define NO_PASS_DOORS 0 43#define NO_PASS_DOORS 0
47#define PASS_DOORS 1 44#define PASS_DOORS 1
48 45
46static object *find_closest_monster (maptile *map, int x, int y, random_map_params *RP);
47static object *find_monster_in_room (maptile *map, int x, int y, random_map_params *RP);
48static void find_spot_in_room_recursive (char **layout, int x, int y, random_map_params *RP);
49static void find_spot_in_room (maptile *map, int x, int y, int *kx, int *ky, random_map_params *RP);
50static object *place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP);
51static object **find_doors_in_room (maptile *map, int x, int y, random_map_params *RP);
52static void lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP);
53static void find_enclosed_spot (maptile *map, int *cx, int *cy, random_map_params *RP);
54static object **surround_by_doors (maptile *map, char **layout, int x, int y, int opts);
55
56/* a macro to get a strongly centered random distribution,
57 from 0 to x, centered at x/2 */
58static int
59bc_random (int x)
60{
61 return (rmg_rndm (x) + rmg_rndm (x) + rmg_rndm (x)) / 3;
62}
63
64static object *
65gen_key (const shstr &keycode)
66{
67 /* get a key and set its keycode */
68 object *key = archetype::get (shstr_key_random_map);
69 key->slaying = keycode;
70 return key;
71}
72
73/* places keys in the map, preferably in something alive.
74 keycode is the key's code,
75 door_flag is either PASS_DOORS or NO_PASS_DOORS.
76 NO_PASS_DOORS won't cross doors or walls to keyplace, PASS_DOORS will.
77 if n_keys is 1, it will place 1 key. if n_keys >1, it will place 2-4 keys:
78 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
79
80 The idea is that you call keyplace on x,y where a door is, and it'll make
81 sure a key is placed on both sides of the door.
82*/
83static int
84keyplace (maptile *map, int x, int y, const shstr &keycode, int door_flag, int n_keys, random_map_params *RP)
85{
86 int i, j;
87 int kx = 0, ky = 0;
88 object *the_keymaster; /* the monster that gets the key. */
89 object *the_key = gen_key (keycode);
90
91 if (door_flag == PASS_DOORS)
92 {
93 int tries = 0;
94
95 the_keymaster = 0;
96 while (tries < 15 && !the_keymaster)
97 {
98 i = rmg_rndm (RP->Xsize - 2) + 1;
99 j = rmg_rndm (RP->Ysize - 2) + 1;
100 tries++;
101 the_keymaster = find_closest_monster (map, i, j, RP);
102 }
103
104 /* if we don't find a good keymaster, drop the key on the ground. */
105 if (!the_keymaster)
106 {
107 int freeindex;
108
109 freeindex = -1;
110 for (tries = 0; tries < 15 && freeindex == -1; tries++)
111 {
112 kx = rmg_rndm (RP->Xsize - 2) + 1;
113 ky = rmg_rndm (RP->Ysize - 2) + 1;
114 freeindex = rmg_find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
115 }
116
117 // can freeindex ever be < 0?
118 if (freeindex >= 0)
119 {
120 kx += freearr_x [freeindex];
121 ky += freearr_y [freeindex];
122 }
123 }
124 }
125 else
126 { /* NO_PASS_DOORS --we have to work harder. */
127 /* don't try to keyplace if we're sitting on a blocked square and
128 NO_PASS_DOORS is set. */
129 if (n_keys == 1)
130 {
131 if (wall_blocked (map, x, y))
132 {
133 the_key->destroy ();
134 return 0;
135 }
136
137 the_keymaster = find_monster_in_room (map, x, y, RP);
138 if (!the_keymaster) /* if fail, find a spot to drop the key. */
139 find_spot_in_room (map, x, y, &kx, &ky, RP);
140 }
141 else
142 {
143 int sum = 0; /* count how many keys we actually place */
144
145 /* I'm lazy, so just try to place in all 4 directions. */
146 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
147 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
148 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
149 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
150
151 if (sum < 2) /* we might have made a disconnected map-place more keys. */
152 { /* diagonally this time. */
153 keyplace (map, x + 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
154 keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
155 keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
156 keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
157 }
158
159 the_key->destroy ();
160 return 1;
161 }
162 }
163
164 if (the_keymaster)
165 the_keymaster->head_ ()->insert (the_key);
166 else
167 {
168 the_key->x = kx;
169 the_key->y = ky;
170 insert_ob_in_map (the_key, map, NULL, 0);
171 }
172
173 return 1;
174}
49 175
50/* returns true if square x,y has P_NO_PASS set, which is true for walls 176/* returns true if square x,y has P_NO_PASS set, which is true for walls
51 * and doors but not monsters. 177 * and doors but not monsters.
52 * This function is not map tile aware. 178 * This function is not map tile aware.
53 */ 179 */
54
55int 180int
56wall_blocked (maptile *m, int x, int y) 181wall_blocked (maptile *m, int x, int y)
57{ 182{
58 int r;
59
60 if (OUT_OF_REAL_MAP (m, x, y)) 183 if (OUT_OF_REAL_MAP (m, x, y))
61 return 1; 184 return 1;
185
186 m->at (x, y).update ();
62 r = GET_MAP_MOVE_BLOCK (m, x, y) & ~MOVE_BLOCK_DEFAULT; 187 return GET_MAP_MOVE_BLOCK (m, x, y) & MOVE_WALK;
63 return r;
64} 188}
65 189
66/* place treasures in the map, given the 190/* place treasures in the map, given the
67map, (required) 191map, (required)
68layout, (required) 192layout, (required)
69treasure style (may be empty or NULL, or "none" to cause no treasure.) 193treasure style (may be empty or NULL, or "none" to cause no treasure.)
70treasureoptions (may be 0 for random choices or positive) 194treasureoptions (may be 0 for random choices or positive)
71*/ 195*/
72
73void 196void
74place_treasure (maptile *map, char **layout, char *treasure_style, int treasureoptions, random_map_params *RP) 197place_treasure (maptile *map, char **layout, const char *treasure_style, int treasureoptions, random_map_params *RP)
75{ 198{
76 char styledirname[1024];
77 char stylefilepath[1024];
78 maptile *style_map = 0;
79 int num_treasures; 199 int num_treasures;
80 200
81 /* bail out if treasure isn't wanted. */ 201 /* bail out if treasure isn't wanted. */
82 if (treasure_style) 202 if (treasure_style)
83 if (!strcmp (treasure_style, "none")) 203 if (!strcmp (treasure_style, "none"))
84 return; 204 return;
205
85 if (treasureoptions <= 0) 206 if (treasureoptions <= 0)
86 treasureoptions = RANDOM () % (2 * LAST_OPTION); 207 treasureoptions = rmg_rndm (2 * LAST_OPTION);
87 208
88 /* filter out the mutually exclusive options */ 209 /* filter out the mutually exclusive options */
89 if ((treasureoptions & RICH) && (treasureoptions & SPARSE)) 210 if ((treasureoptions & RICH) && (treasureoptions & SPARSE))
90 { 211 {
91 if (RANDOM () % 2) 212 if (rmg_rndm (2))
92 treasureoptions -= 1; 213 treasureoptions -= 1;
93 else 214 else
94 treasureoptions -= 2; 215 treasureoptions -= 2;
95 } 216 }
96 217
97 /* pick the number of treasures */ 218 /* pick the number of treasures */
98 if (treasureoptions & SPARSE) 219 if (treasureoptions & SPARSE)
99 num_treasures = BC_RANDOM (RP->total_map_hp / 600 + RP->difficulty / 2 + 1); 220 num_treasures = bc_random (RP->total_map_hp / 600 + RP->difficulty / 2 + 1);
100 else if (treasureoptions & RICH) 221 else if (treasureoptions & RICH)
101 num_treasures = BC_RANDOM (RP->total_map_hp / 150 + 2 * RP->difficulty + 1); 222 num_treasures = bc_random (RP->total_map_hp / 150 + 2 * RP->difficulty + 1);
102 else 223 else
103 num_treasures = BC_RANDOM (RP->total_map_hp / 300 + RP->difficulty + 1); 224 num_treasures = bc_random (RP->total_map_hp / 300 + RP->difficulty + 1);
104 225
105 if (num_treasures <= 0) 226 if (num_treasures <= 0)
106 return; 227 return;
107 228
108 /* get the style map */ 229 /* get the style map */
109 sprintf (styledirname, "%s", "/styles/treasurestyles"); 230 maptile *style_map = find_style ("/styles/treasurestyles", treasure_style, RP->difficulty);
110 sprintf (stylefilepath, "%s/%s", styledirname, treasure_style); 231
111 style_map = find_style (styledirname, treasure_style, -1); 232 if (!style_map)
233 {
234 LOG (llevError, "unable to load style map %s %s.\n", "/styles/treasurestyles", treasure_style);
235 return;
236 }
112 237
113 /* all the treasure at one spot in the map. */ 238 /* all the treasure at one spot in the map. */
114 if (treasureoptions & CONCENTRATED) 239 if (treasureoptions & CONCENTRATED)
115 { 240 {
116
117 /* map_layout_style global, and is previously set */ 241 /* map_layout_style global, and is previously set */
118 switch (RP->map_layout_style) 242 switch (RP->map_layout_style)
119 { 243 {
120 case LAYOUT_ONION: 244 case LAYOUT_ONION:
121 case LAYOUT_SPIRAL: 245 case LAYOUT_SPIRAL:
… …
129 for (j = 0; j < RP->Ysize; j++) 253 for (j = 0; j < RP->Ysize; j++)
130 { 254 {
131 if (layout[i][j] == 'C' || layout[i][j] == '>') 255 if (layout[i][j] == 'C' || layout[i][j] == '>')
132 { 256 {
133 int tdiv = RP->symmetry_used; 257 int tdiv = RP->symmetry_used;
134 object **doorlist;
135 object *chest; 258 object *chest;
136 259
137 if (tdiv == 3) 260 if (tdiv == 3)
138 tdiv = 2; /* this symmetry uses a divisor of 2 */ 261 tdiv = 2; /* this symmetry uses a divisor of 2 */
262
139 /* don't put a chest on an exit. */ 263 /* don't put a chest on an exit. */
140 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
141 if (!chest) 266 if (!chest)
142 continue; /* if no chest was placed NEXT */ 267 continue; /* if no chest was placed NEXT */
268
143 if (treasureoptions & (DOORED | HIDDEN)) 269 if (treasureoptions & (DOORED | HIDDEN))
144 { 270 {
145 doorlist = find_doors_in_room (map, i, j, RP); 271 object **doorlist = find_doors_in_room (map, i, j, RP);
146 lock_and_hide_doors (doorlist, map, treasureoptions, RP); 272 lock_and_hide_doors (doorlist, map, treasureoptions, RP);
147 free (doorlist); 273 free (doorlist);
148 } 274 }
149 } 275 }
150 } 276 }
151 } 277 }
152 break; 278 break;
153 } 279 }
280
154 default: 281 default:
155 { 282 {
156 int i, j, tries; 283 int i, j, tries;
157 object *chest; 284 object *chest;
158 object **doorlist; 285 object **doorlist;
159 286
160 i = j = -1; 287 i = j = -1;
161 tries = 0; 288 tries = 0;
162 while (i == -1 && tries < 100) 289 while (i == -1 && tries < 100)
163 { 290 {
164 i = RANDOM () % (RP->Xsize - 2) + 1; 291 i = rmg_rndm (RP->Xsize - 2) + 1;
165 j = RANDOM () % (RP->Ysize - 2) + 1; 292 j = rmg_rndm (RP->Ysize - 2) + 1;
166 find_enclosed_spot (map, &i, &j, RP); 293 find_enclosed_spot (map, &i, &j, RP);
294
167 if (wall_blocked (map, i, j)) 295 if (wall_blocked (map, i, j))
168 i = -1; 296 i = -1;
297
169 tries++; 298 tries++;
170 } 299 }
300
171 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
172 if (!chest) 303 if (!chest)
173 return; 304 return;
305
174 i = chest->x; 306 i = chest->x;
175 j = chest->y; 307 j = chest->y;
176 if (treasureoptions & (DOORED | HIDDEN)) 308 if (treasureoptions & (DOORED | HIDDEN))
177 { 309 {
178 doorlist = surround_by_doors (map, layout, i, j, treasureoptions); 310 doorlist = surround_by_doors (map, layout, i, j, treasureoptions);
… …
186 { /* DIFFUSE treasure layout */ 318 { /* DIFFUSE treasure layout */
187 int ti, i, j; 319 int ti, i, j;
188 320
189 for (ti = 0; ti < num_treasures; ti++) 321 for (ti = 0; ti < num_treasures; ti++)
190 { 322 {
191 i = RANDOM () % (RP->Xsize - 2) + 1; 323 i = rmg_rndm (RP->Xsize - 2) + 1;
192 j = RANDOM () % (RP->Ysize - 2) + 1; 324 j = rmg_rndm (RP->Ysize - 2) + 1;
193 place_chest (treasureoptions, i, j, map, style_map, 1, RP); 325 place_chest (treasureoptions, i, j, map, style_map, 1, RP);
194 } 326 }
195 } 327 }
196} 328}
197 329
198/* 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
199 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,
200 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 */
201 333static object *
202object *
203place_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)
204{ 335{
205 object *the_chest;
206 int i, xl, yl;
207
208 the_chest = get_archetype ("chest"); /* was "chest_2" */ 336 object *the_chest = archetype::get (shstr_chest); /* was "chest_2" */
209 337
210 /* first, find a place to put the chest. */ 338 /* first, find a place to put the chest. */
211 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
212 if (i == -1) 340 if (i == -1)
213 { 341 {
214 the_chest->destroy (); 342 the_chest->destroy ();
215 return NULL; 343 return NULL;
216 } 344 }
345
217 xl = x + freearr_x[i]; 346 int xl = x + freearr_x[i];
218 yl = y + freearr_y[i]; 347 int yl = y + freearr_y[i];
219 348
220 /* if the placement is blocked, return a fail. */ 349 /* if the placement is blocked, return a fail. */
221 if (wall_blocked (map, xl, yl)) 350 if (wall_blocked (map, xl, yl))
222 return 0; 351 return 0;
223 352
… …
230 treasurelist *tlist = find_treasurelist (RP->treasurestyle); 359 treasurelist *tlist = find_treasurelist (RP->treasurestyle);
231 360
232 if (tlist != NULL) 361 if (tlist != NULL)
233 for (ti = 0; ti < n_treasures; ti++) 362 for (ti = 0; ti < n_treasures; ti++)
234 { /* use the treasure list */ 363 { /* use the treasure list */
235 object *new_treasure = pick_random_object (style_map); 364 object *new_treasure = style_map->pick_random_object (rmg_rndm);
236 365
237 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest); 366 insert_ob_in_ob (new_treasure->arch->instance (), the_chest);
238 } 367 }
239 else 368 else
240 { /* use the style map */ 369 { /* use the style map */
241 the_chest->randomitems = tlist; 370 the_chest->randomitems = tlist;
242 the_chest->stats.hp = n_treasures; 371 the_chest->stats.hp = n_treasures;
243 } 372 }
244#endif 373#endif
245 { /* neither style_map no treasure list given */ 374 { /* neither style_map no treasure list given */
246 treasurelist *tlist = find_treasurelist ("chest"); 375 treasurelist *tlist = treasurelist::find ("chest");
247 376
248 the_chest->randomitems = tlist; 377 the_chest->randomitems = tlist;
249 the_chest->stats.hp = n_treasures; 378 the_chest->stats.hp = n_treasures;
250 } 379 }
251 380
252 /* stick a trap in the chest if required */ 381 /* stick a trap in the chest if required */
253 if (treasureoptions & TRAPPED) 382 if (treasureoptions & TRAPPED)
254 { 383 {
255 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1); 384 maptile *trap_map = find_style ("/styles/trapstyles", "traps", RP->difficulty);
256 object *the_trap;
257 385
258 if (trap_map) 386 if (trap_map)
259 { 387 {
260 the_trap = pick_random_object (trap_map); 388 object *the_trap = trap_map->pick_random_object (rmg_rndm);
389
261 the_trap->stats.Cha = 10 + RP->difficulty; 390 the_trap->stats.Cha = 10 + RP->difficulty;
262 the_trap->level = BC_RANDOM ((3 * RP->difficulty) / 2); 391 the_trap->level = bc_random ((3 * RP->difficulty) / 2);
392
263 if (the_trap) 393 if (the_trap)
264 { 394 {
265 object *new_trap; 395 object *new_trap = the_trap->arch->instance ();//TODO: why not clone?
266 396
267 new_trap = arch_to_object (the_trap->arch);
268 new_trap->copy_to (the_trap);
269 new_trap->x = x; 397 new_trap->x = x;
270 new_trap->y = y; 398 new_trap->y = y;
271 insert_ob_in_ob (new_trap, the_chest); 399 insert_ob_in_ob (new_trap, the_chest);
272 } 400 }
273 } 401 }
274 } 402 }
275 403
276 /* set the chest lock code, and call the keyplacer routine with 404 /* set the chest lock code, and call the keyplacer routine with
277 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
278 there's only 1 treasure.... */ 406 there's only 1 treasure.... */
279
280 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1) 407 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1)
281 { 408 {
282 char keybuf[1024]; 409 the_chest->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
283
284 sprintf (keybuf, "%d", (int) RANDOM ());
285 the_chest->slaying = keybuf;
286 keyplace (map, x, y, keybuf, PASS_DOORS, 1, RP); 410 keyplace (map, x, y, the_chest->slaying, PASS_DOORS, 1, RP);
287 } 411 }
288 412
289 /* actually place the chest. */ 413 /* actually place the chest. */
290 the_chest->x = xl; 414 the_chest->x = xl;
291 the_chest->y = yl; 415 the_chest->y = yl;
292 insert_ob_in_map (the_chest, map, NULL, 0); 416 insert_ob_in_map (the_chest, map, NULL, 0);
293 return the_chest; 417 return the_chest;
294} 418}
295 419
296
297/* finds the closest monster and returns him, regardless of doors 420/* finds the closest monster and returns him, regardless of doors or walls */
298 or walls */ 421static object *
299object *
300find_closest_monster (maptile *map, int x, int y, random_map_params *RP) 422find_closest_monster (maptile *map, int x, int y, random_map_params *RP)
301{ 423{
302 int i; 424 int i;
303 425
304 for (i = 0; i < SIZEOFFREE; i++) 426 for (i = 0; i < SIZEOFFREE; i++)
… …
312 /* don't bother searching this square unless the map says life exists. */ 434 /* don't bother searching this square unless the map says life exists. */
313 if (GET_MAP_FLAGS (map, lx, ly) & P_IS_ALIVE) 435 if (GET_MAP_FLAGS (map, lx, ly) & P_IS_ALIVE)
314 { 436 {
315 object *the_monster = GET_MAP_OB (map, lx, ly); 437 object *the_monster = GET_MAP_OB (map, lx, ly);
316 438
317 for (; the_monster != NULL && (!QUERY_FLAG (the_monster, FLAG_MONSTER)); the_monster = the_monster->above); 439 for (; the_monster != NULL && (!the_monster->flag [FLAG_MONSTER]); the_monster = the_monster->above);
318 if (the_monster && QUERY_FLAG (the_monster, FLAG_MONSTER)) 440 if (the_monster && the_monster->flag [FLAG_MONSTER])
319 return the_monster; 441 return the_monster;
320 } 442 }
321 } 443 }
322 return NULL; 444 return NULL;
323} 445}
324 446
325
326
327/* places keys in the map, preferably in something alive.
328 keycode is the key's code,
329 door_flag is either PASS_DOORS or NO_PASS_DOORS.
330 NO_PASS_DOORS won't cross doors or walls to keyplace, PASS_DOORS will.
331 if n_keys is 1, it will place 1 key. if n_keys >1, it will place 2-4 keys:
332 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
333
334 The idea is that you call keyplace on x,y where a door is, and it'll make
335 sure a key is placed on both sides of the door.
336*/
337
338int
339keyplace (maptile *map, int x, int y, char *keycode, int door_flag, int n_keys, random_map_params *RP)
340{
341 int i, j;
342 int kx, ky;
343 object *the_keymaster; /* the monster that gets the key. */
344 object *the_key;
345
346 /* get a key and set its keycode */
347 the_key = get_archetype ("key2");
348 the_key->slaying = keycode;
349
350 if (door_flag == PASS_DOORS)
351 {
352 int tries = 0;
353
354 the_keymaster = NULL;
355 while (tries < 15 && the_keymaster == NULL)
356 {
357 i = (RANDOM () % (RP->Xsize - 2)) + 1;
358 j = (RANDOM () % (RP->Ysize - 2)) + 1;
359 tries++;
360 the_keymaster = find_closest_monster (map, i, j, RP);
361 }
362 /* if we don't find a good keymaster, drop the key on the ground. */
363 if (the_keymaster == NULL)
364 {
365 int freeindex;
366
367 freeindex = -1;
368 for (tries = 0; tries < 15 && freeindex == -1; tries++)
369 {
370 kx = (RANDOM () % (RP->Xsize - 2)) + 1;
371 ky = (RANDOM () % (RP->Ysize - 2)) + 1;
372 freeindex = find_first_free_spot (the_key, map, kx, ky);
373 }
374 if (freeindex != -1)
375 {
376 kx += freearr_x[freeindex];
377 ky += freearr_y[freeindex];
378 }
379 }
380 }
381 else
382 { /* NO_PASS_DOORS --we have to work harder. */
383 /* don't try to keyplace if we're sitting on a blocked square and
384 NO_PASS_DOORS is set. */
385 if (n_keys == 1)
386 {
387 if (wall_blocked (map, x, y))
388 return 0;
389 the_keymaster = find_monster_in_room (map, x, y, RP);
390 if (the_keymaster == NULL) /* if fail, find a spot to drop the key. */
391 find_spot_in_room (map, x, y, &kx, &ky, RP);
392 }
393 else
394 {
395 int sum = 0; /* count how many keys we actually place */
396
397 /* I'm lazy, so just try to place in all 4 directions. */
398 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
399 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
400 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
401 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
402 if (sum < 2) /* we might have made a disconnected map-place more keys. */
403 { /* diagnoally this time. */
404 keyplace (map, x + 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
405 keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
406 keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
407 keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
408 }
409 return 1;
410 }
411 }
412
413 if (the_keymaster == NULL)
414 {
415 the_key->x = kx;
416 the_key->y = ky;
417 insert_ob_in_map (the_key, map, NULL, 0);
418 return 1;
419 }
420
421 insert_ob_in_ob (the_key, the_keymaster);
422 return 1;
423}
424
425
426
427/* both find_monster_in_room routines need to have access to this. */ 447/* both find_monster_in_room routines need to have access to this. */
428 448
429object *theMonsterToFind; 449static object *theMonsterToFind;
430 450
431/* a recursive routine which will return a monster, eventually,if there is one. 451/* a recursive routine which will return a monster, eventually,if there is one.
432 it does a check-off on the layout, converting 0's to 1's */ 452 it does a check-off on the layout, converting 0's to 1's */
433 453static object *
434object *
435find_monster_in_room_recursive (char **layout, maptile *map, int x, int y, random_map_params *RP) 454find_monster_in_room_recursive (char **layout, maptile *map, int x, int y, random_map_params *RP)
436{ 455{
437 int i, j; 456 int i, j;
438 457
439 /* if we've found a monster already, leave */ 458 /* if we've found a monster already, leave */
… …
454 if (GET_MAP_FLAGS (map, x, y) & P_IS_ALIVE) 473 if (GET_MAP_FLAGS (map, x, y) & P_IS_ALIVE)
455 { 474 {
456 object *the_monster = GET_MAP_OB (map, x, y); 475 object *the_monster = GET_MAP_OB (map, x, y);
457 476
458 /* check off this point */ 477 /* check off this point */
459 for (; the_monster != NULL && (!QUERY_FLAG (the_monster, FLAG_ALIVE)); the_monster = the_monster->above); 478 for (; the_monster != NULL && (!the_monster->flag [FLAG_ALIVE]); the_monster = the_monster->above);
460 if (the_monster && QUERY_FLAG (the_monster, FLAG_ALIVE)) 479 if (the_monster && the_monster->flag [FLAG_ALIVE])
461 { 480 {
462 theMonsterToFind = the_monster; 481 theMonsterToFind = the_monster;
463 return theMonsterToFind; 482 return theMonsterToFind;
464 } 483 }
465 } 484 }
466 485
467 /* now search all the 8 squares around recursively for a monster,in random order */ 486 /* now search all the 8 squares around recursively for a monster,in random order */
468 for (i = RANDOM () % 8, j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 487 for (i = rmg_rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
469 { 488 {
470 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 489 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
471 if (theMonsterToFind != NULL) 490 if (theMonsterToFind != NULL)
472 return theMonsterToFind; 491 return theMonsterToFind;
473 } 492 }
493
474 return theMonsterToFind; 494 return theMonsterToFind;
475} 495}
476
477 496
478/* sets up some data structures: the _recursive form does the 497/* sets up some data structures: the _recursive form does the
479 real work. */ 498 real work. */
480 499static object *
481object *
482find_monster_in_room (maptile *map, int x, int y, random_map_params *RP) 500find_monster_in_room (maptile *map, int x, int y, random_map_params *RP)
483{ 501{
484 char **layout2; 502 Layout layout2 (map->width, map->height);
485 int i, j; 503
504 // find walls
505 for (int i = 0; i < layout2.w; i++)
506 for (int j = 0; j < layout2.h; j++)
507 layout2[i][j] = wall_blocked (map, i, j) ? '#' : 0;
486 508
487 theMonsterToFind = 0; 509 theMonsterToFind = 0;
488 layout2 = (char **) calloc (sizeof (char *), RP->Xsize);
489 /* allocate and copy the layout, converting C to 0. */
490 for (i = 0; i < RP->Xsize; i++)
491 {
492 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
493 for (j = 0; j < RP->Ysize; j++)
494 {
495 if (wall_blocked (map, i, j))
496 layout2[i][j] = '#';
497 }
498 }
499 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP); 510 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP);
500 511
501 /* deallocate the temp. layout */
502 for (i = 0; i < RP->Xsize; i++)
503 {
504 free (layout2[i]);
505 }
506 free (layout2);
507
508 return theMonsterToFind; 512 return theMonsterToFind;
509} 513}
510 514
511
512
513
514/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */ 515/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */
515int *room_free_spots_x; 516static int *room_free_spots_x;
516int *room_free_spots_y; 517static int *room_free_spots_y;
517int number_of_free_spots_in_room; 518static int number_of_free_spots_in_room;
518 519
519/* the workhorse routine, which finds the free spots in a room: 520/* the workhorse routine, which finds the free spots in a room:
520a datastructure of free points is set up, and a position chosen from 521a datastructure of free points is set up, and a position chosen from
521that datastructure. */ 522that datastructure. */
522 523static void
523void
524find_spot_in_room_recursive (char **layout, int x, int y, random_map_params *RP) 524find_spot_in_room_recursive (char **layout, int x, int y, random_map_params *RP)
525{ 525{
526 int i, j; 526 int i, j;
527 527
528 /* bounds check x and y */ 528 /* bounds check x and y */
… …
538 /* check off this point */ 538 /* check off this point */
539 layout[x][y] = 1; 539 layout[x][y] = 1;
540 room_free_spots_x[number_of_free_spots_in_room] = x; 540 room_free_spots_x[number_of_free_spots_in_room] = x;
541 room_free_spots_y[number_of_free_spots_in_room] = y; 541 room_free_spots_y[number_of_free_spots_in_room] = y;
542 number_of_free_spots_in_room++; 542 number_of_free_spots_in_room++;
543
543 /* now search all the 8 squares around recursively for free spots,in random order */ 544 /* now search all the 8 squares around recursively for free spots,in random order */
544 for (i = RANDOM () % 8, j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 545 for (i = rmg_rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
545 {
546 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 546 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
547 }
548 547
549} 548}
550 549
551/* find a random non-blocked spot in this room to drop a key. */ 550/* find a random non-blocked spot in this room to drop a key. */
552void 551static void
553find_spot_in_room (maptile *map, int x, int y, int *kx, int *ky, random_map_params *RP) 552find_spot_in_room (maptile *map, int x, int y, int *kx, int *ky, random_map_params *RP)
554{ 553{
555 char **layout2; 554 char **layout2;
556 int i, j; 555 int i, j;
557 556
… …
563 /* allocate and copy the layout, converting C to 0. */ 562 /* allocate and copy the layout, converting C to 0. */
564 for (i = 0; i < RP->Xsize; i++) 563 for (i = 0; i < RP->Xsize; i++)
565 { 564 {
566 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize); 565 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
567 for (j = 0; j < RP->Ysize; j++) 566 for (j = 0; j < RP->Ysize; j++)
568 {
569 if (wall_blocked (map, i, j)) 567 if (wall_blocked (map, i, j))
570 layout2[i][j] = '#'; 568 layout2[i][j] = '#';
571 }
572 } 569 }
573 570
574 /* setup num_free_spots and room_free_spots */ 571 /* setup num_free_spots and room_free_spots */
575 find_spot_in_room_recursive (layout2, x, y, RP); 572 find_spot_in_room_recursive (layout2, x, y, RP);
576 573
577 if (number_of_free_spots_in_room > 0) 574 if (number_of_free_spots_in_room > 0)
578 { 575 {
579 i = RANDOM () % number_of_free_spots_in_room; 576 i = rmg_rndm (number_of_free_spots_in_room);
580 *kx = room_free_spots_x[i]; 577 *kx = room_free_spots_x[i];
581 *ky = room_free_spots_y[i]; 578 *ky = room_free_spots_y[i];
582 } 579 }
583 580
584 /* deallocate the temp. layout */ 581 /* deallocate the temp. layout */
585 for (i = 0; i < RP->Xsize; i++) 582 for (i = 0; i < RP->Xsize; i++)
586 {
587 free (layout2[i]); 583 free (layout2[i]);
588 } 584
589 free (layout2); 585 free (layout2);
590 free (room_free_spots_x); 586 free (room_free_spots_x);
591 free (room_free_spots_y); 587 free (room_free_spots_y);
592} 588}
593 589
594 590
595/* searches the map for a spot with walls around it. The more 591/* searches the map for a spot with walls around it. The more
596 walls the better, but it'll settle for 1 wall, or even 0, but 592 walls the better, but it'll settle for 1 wall, or even 0, but
597 it'll return 0 if no FREE spots are found.*/ 593 it'll return 0 if no FREE spots are found.*/
598 594static void
599void
600find_enclosed_spot (maptile *map, int *cx, int *cy, random_map_params *RP) 595find_enclosed_spot (maptile *map, int *cx, int *cy, random_map_params *RP)
601{ 596{
602 int x, y; 597 int x, y;
603 int i; 598 int i;
604 599
… …
609 { 604 {
610 int lx, ly, sindex; 605 int lx, ly, sindex;
611 606
612 lx = x + freearr_x[i]; 607 lx = x + freearr_x[i];
613 ly = y + freearr_y[i]; 608 ly = y + freearr_y[i];
614 sindex = surround_flag3 (map, lx, ly, RP); 609 sindex = surround_flag3 (map, lx, ly);
615 /* if it's blocked on 3 sides, it's enclosed */ 610 /* if it's blocked on 3 sides, it's enclosed */
616 if (sindex == 7 || sindex == 11 || sindex == 13 || sindex == 14) 611 if (sindex == 7 || sindex == 11 || sindex == 13 || sindex == 14)
617 { 612 {
618 *cx = lx; 613 *cx = lx;
619 *cy = ly; 614 *cy = ly;
… …
627 { 622 {
628 int lx, ly, sindex; 623 int lx, ly, sindex;
629 624
630 lx = x + freearr_x[i]; 625 lx = x + freearr_x[i];
631 ly = y + freearr_y[i]; 626 ly = y + freearr_y[i];
632 sindex = surround_flag3 (map, lx, ly, RP); 627 sindex = surround_flag3 (map, lx, ly);
633 /* if it's blocked on 3 sides, it's enclosed */ 628 /* if it's blocked on 3 sides, it's enclosed */
634 if (sindex == 3 || sindex == 5 || sindex == 9 || sindex == 6 || sindex == 10 || sindex == 12) 629 if (sindex == 3 || sindex == 5 || sindex == 9 || sindex == 6 || sindex == 10 || sindex == 12)
635 { 630 {
636 *cx = lx; 631 *cx = lx;
637 *cy = ly; 632 *cy = ly;
… …
644 { 639 {
645 int lx, ly, sindex; 640 int lx, ly, sindex;
646 641
647 lx = x + freearr_x[i]; 642 lx = x + freearr_x[i];
648 ly = y + freearr_y[i]; 643 ly = y + freearr_y[i];
649 sindex = surround_flag3 (map, lx, ly, RP); 644 sindex = surround_flag3 (map, lx, ly);
650 /* if it's blocked on 3 sides, it's enclosed */ 645 /* if it's blocked on 3 sides, it's enclosed */
651 if (sindex) 646 if (sindex)
652 { 647 {
653 *cx = lx; 648 *cx = lx;
654 *cy = ly; 649 *cy = ly;
655 return; 650 return;
656 } 651 }
657 } 652 }
658 /* give up and return the closest free spot. */ 653 /* give up and return the closest free spot. */
659 i = find_first_free_spot (&archetype::find ("chest")->clone, map, x, y); 654 i = rmg_find_free_spot (archetype::find (shstr_chest), map, x, y, 1, SIZEOFFREE1 + 1);
660 if (i != -1 && i <= SIZEOFFREE1) 655
656 if (i != -1)
661 { 657 {
662 *cx = x + freearr_x[i]; 658 *cx = x + freearr_x[i];
663 *cy = y + freearr_y[i]; 659 *cy = y + freearr_y[i];
664 return; 660 }
661 else
665 } 662 {
666 /* indicate failure */ 663 /* indicate failure */
664 *cx = -1;
667 *cx = *cy = -1; 665 *cy = -1;
666 }
668} 667}
669 668
670 669static void
671void
672remove_monsters (int x, int y, maptile *map) 670remove_monsters (int x, int y, maptile *map)
673{ 671{
674 object *tmp; 672 for (object *tmp = GET_MAP_OB (map, x, y); tmp; )
675
676 for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above)
677 if (QUERY_FLAG (tmp, FLAG_ALIVE))
678 { 673 {
679 if (tmp->head) 674 object *next = tmp->above;
680 tmp = tmp->head; 675
681 tmp->remove (); 676 if (tmp->flag [FLAG_ALIVE])
682 tmp->destroy (); 677 tmp->head_ ()->destroy ();
683 tmp = GET_MAP_OB (map, x, y); 678
684 if (tmp == NULL) 679 tmp = next;
685 break;
686 }; 680 }
687} 681}
688
689 682
690/* surrounds the point x,y by doors, so as to enclose something, like 683/* surrounds the point x,y by doors, so as to enclose something, like
691 a chest. It only goes as far as the 8 squares surrounding, and 684 a chest. It only goes as far as the 8 squares surrounding, and
692 it'll remove any monsters it finds.*/ 685 it'll remove any monsters it finds.*/
693 686static object **
694object **
695surround_by_doors (maptile *map, char **layout, int x, int y, int opts) 687surround_by_doors (maptile *map, char **layout, int x, int y, int opts)
696{ 688{
697 int i; 689 int i;
698 char *doors[2]; 690 const char *doors[2];
699 object **doorlist; 691 object **doorlist;
700 int ndoors_made = 0; 692 int ndoors_made = 0;
701 doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */ 693 doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */
702 694
703 /* this is a list we pick from, for horizontal and vertical doors */ 695 /* this is a list we pick from, for horizontal and vertical doors */
… …
715 /* place doors in all the 8 adjacent unblocked squares. */ 707 /* place doors in all the 8 adjacent unblocked squares. */
716 for (i = 1; i < 9; i++) 708 for (i = 1; i < 9; i++)
717 { 709 {
718 int x1 = x + freearr_x[i], y1 = y + freearr_y[i]; 710 int x1 = x + freearr_x[i], y1 = y + freearr_y[i];
719 711
720 if (!wall_blocked (map, x1, y1) || layout[x1][y1] == '>') 712 if (!wall_blocked (map, x1, y1) && layout[x1][y1] == '>')
721 { /* place a door */ 713 { /* place a door */
714 remove_monsters (x1, y1, map);
715
722 object *new_door = get_archetype ((freearr_x[i] == 0) ? doors[1] : doors[0]); 716 object *new_door = get_archetype (freearr_x[i] == 0 ? doors[1] : doors[0]);
723 717 map->insert (new_door, x1, y1);
724 new_door->x = x + freearr_x[i];
725 new_door->y = y + freearr_y[i];
726 remove_monsters (new_door->x, new_door->y, map);
727 insert_ob_in_map (new_door, map, NULL, 0);
728 doorlist[ndoors_made] = new_door; 718 doorlist[ndoors_made] = new_door;
729 ndoors_made++; 719 ndoors_made++;
730 } 720 }
731 } 721 }
722
732 return doorlist; 723 return doorlist;
733} 724}
734 725
735
736/* returns the first door in this square, or NULL if there isn't a door. */ 726/* returns the first door in this square, or NULL if there isn't a door. */
737object * 727static object *
738door_in_square (maptile *map, int x, int y) 728door_in_square (maptile *map, int x, int y)
739{ 729{
740 object *tmp;
741
742 for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above) 730 for (object *tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
743 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) 731 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
744 return tmp; 732 return tmp;
733
745 return NULL; 734 return NULL;
746} 735}
747 736
748
749/* the workhorse routine, which finds the doors in a room */ 737/* the workhorse routine, which finds the doors in a room */
750void 738static void
751find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, random_map_params *RP) 739find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, random_map_params *RP)
752{ 740{
753 int i, j; 741 int i, j;
754 object *door; 742 object *door;
755 743
… …
767 layout[x][y] = 1; 755 layout[x][y] = 1;
768 door = door_in_square (map, x, y); 756 door = door_in_square (map, x, y);
769 if (door) 757 if (door)
770 { 758 {
771 doorlist[*ndoors] = door; 759 doorlist[*ndoors] = door;
760
772 if (*ndoors > 1022) /* eek! out of memory */ 761 if (*ndoors > 1022) /* eek! out of memory */
773 { 762 {
774 LOG (llevError, "find_doors_in_room_recursive:Too many doors for memory allocated!\n"); 763 LOG (llevError, "find_doors_in_room_recursive:Too many doors for memory allocated!\n");
775 return; 764 return;
776 } 765 }
… …
779 } 768 }
780 } 769 }
781 else 770 else
782 { 771 {
783 layout[x][y] = 1; 772 layout[x][y] = 1;
773
784 /* now search all the 8 squares around recursively for free spots,in random order */ 774 /* now search all the 8 squares around recursively for free spots,in random order */
785 for (i = RANDOM () % 8, j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 775 for (i = rmg_rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
786 find_doors_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], doorlist, ndoors, RP); 776 find_doors_in_room_recursive (layout, map,
777 x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1],
778 doorlist, ndoors, RP);
787 } 779 }
788} 780}
789 781
790/* find a random non-blocked spot in this room to drop a key. */ 782/* find a random non-blocked spot in this room to drop a key. */
791object ** 783static object **
792find_doors_in_room (maptile *map, int x, int y, random_map_params *RP) 784find_doors_in_room (maptile *map, int x, int y, random_map_params *RP)
793{ 785{
794 char **layout2;
795 object **doorlist;
796 int i, j; 786 int i, j;
797 int ndoors = 0; 787 int ndoors = 0;
798 788
799 doorlist = (object **) calloc (sizeof (int), 1024); 789 object **doorlist = (object **)calloc (sizeof (int), 1024);
800 790
801 layout2 = (char **) calloc (sizeof (char *), RP->Xsize); 791 Layout layout2 (RP->Xsize, RP->Ysize);
792 layout2.clear ();
793
802 /* allocate and copy the layout, converting C to 0. */ 794 /* allocate and copy the layout, converting C to 0. */
803 for (i = 0; i < RP->Xsize; i++) 795 for (i = 0; i < RP->Xsize; i++)
804 {
805 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
806 for (j = 0; j < RP->Ysize; j++) 796 for (j = 0; j < RP->Ysize; j++)
807 { 797 layout2[i][j] = wall_blocked (map, i, j) ? '#' : 0;
808 if (wall_blocked (map, i, j))
809 layout2[i][j] = '#';
810 }
811 }
812 798
813 /* setup num_free_spots and room_free_spots */ 799 /* setup num_free_spots and room_free_spots */
814 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP); 800 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP);
815 801
816 /* deallocate the temp. layout */
817 for (i = 0; i < RP->Xsize; i++)
818 free (layout2[i]);
819
820 free (layout2);
821 return doorlist; 802 return doorlist;
822} 803}
823
824
825 804
826/* locks and/or hides all the doors in doorlist, or does nothing if 805/* locks and/or hides all the doors in doorlist, or does nothing if
827 opts doesn't say to lock/hide doors. */ 806 opts doesn't say to lock/hide doors. */
828 807static void
829void
830lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP) 808lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP)
831{ 809{
832 object *door; 810 object *door;
833 int i; 811 int i;
834 812
835 /* lock the doors and hide the keys. */ 813 /* lock the doors and hide the keys. */
836 814
837 if (opts & DOORED) 815 if (opts & DOORED)
838 { 816 {
839 for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++) 817 for (i = 0, door = doorlist[0]; doorlist[i]; i++)
840 { 818 {
841 object *new_door = get_archetype ("locked_door1"); 819 object *new_door = get_archetype (shstr_locked_door1);
842 char keybuf[1024];
843 820
844 door = doorlist[i]; 821 door = doorlist[i];
845 new_door->face = door->face; 822 new_door->face = door->face;
846 new_door->x = door->x; 823 new_door->x = door->x;
847 new_door->y = door->y; 824 new_door->y = door->y;
848 door->remove ();
849 door->destroy (); 825 door->destroy ();
850 doorlist[i] = new_door; 826 doorlist[i] = new_door;
851 insert_ob_in_map (new_door, map, NULL, 0); 827 insert_ob_in_map (new_door, map, NULL, 0);
852 sprintf (keybuf, "%d", (int) RANDOM ()); 828 new_door->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
853 new_door->slaying = keybuf;
854 keyplace (map, new_door->x, new_door->y, keybuf, NO_PASS_DOORS, 2, RP); 829 keyplace (map, new_door->x, new_door->y, new_door->slaying, NO_PASS_DOORS, 2, RP);
855 } 830 }
856 } 831 }
857 832
858 /* change the faces of the doors and surrounding walls to hide them. */ 833 /* change the faces of the doors and surrounding walls to hide them. */
859 if (opts & HIDDEN) 834 if (opts & HIDDEN)
… …
868 { 843 {
869 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP); 844 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP);
870 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP); 845 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP);
871 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP); 846 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP);
872 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP); 847 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP);
848
873 door->face = wallface->face; 849 door->face = wallface->face;
874 if (!QUERY_FLAG (wallface, FLAG_REMOVED)) 850
875 wallface->remove ();
876 wallface->destroy (); 851 wallface->destroy ();
877 } 852 }
878 } 853 }
879 } 854 }
880} 855}

Diff Legend

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