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.4 by root, Sun Sep 10 16:06:37 2006 UTC vs.
Revision 1.67 by root, Sat Nov 17 23:40:02 2018 UTC

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

Diff Legend

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