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.2 by root, Tue Aug 29 08:01:36 2006 UTC vs.
Revision 1.56 by root, Fri Jul 2 03:40:14 2010 UTC

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

Diff Legend

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