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

Diff Legend

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