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

Diff Legend

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