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.22 by root, Fri Jan 19 21:49:58 2007 UTC vs.
Revision 1.39 by root, Thu May 8 11:39:24 2008 UTC

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

Diff Legend

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