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

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.14 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.38 by root, Sun May 4 14:12:38 2008 UTC

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

Diff Legend

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