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.35 by root, Mon Apr 14 22:41:17 2008 UTC vs.
Revision 1.57 by root, Fri Jul 2 15:03:57 2010 UTC

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

Diff Legend

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