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

Comparing deliantra/server/random_maps/special.C (file contents):
Revision 1.17 by root, Thu Jan 18 19:42:10 2007 UTC vs.
Revision 1.21 by root, Wed Feb 7 02:04:47 2007 UTC

… …
118 118
119 /* search a bit for a completely free spot. */ 119 /* search a bit for a completely free spot. */
120 for (tries = 0; tries < 20; tries++) 120 for (tries = 0; tries < 20; tries++)
121 { 121 {
122 /* pick a random location in the layout */ 122 /* pick a random location in the layout */
123 i = RANDOM () % (map->width - xsize - 2) + 1; 123 i = rndm (map->width - xsize - 2) + 1;
124 j = RANDOM () % (map->height - ysize - 2) + 1; 124 j = rndm (map->height - ysize - 2) + 1;
125 is_occupied = 0; 125 is_occupied = 0;
126 for (l = i; l < i + xsize; l++) 126 for (l = i; l < i + xsize; l++)
127 for (m = j; m < j + ysize; m++) 127 for (m = j; m < j + ysize; m++)
128 is_occupied |= layout[l][m]; 128 is_occupied |= layout[l][m];
129 if (!is_occupied) 129 if (!is_occupied)
… …
136 if (is_occupied) 136 if (is_occupied)
137 { /* failure, try a relaxed placer. */ 137 { /* failure, try a relaxed placer. */
138 /* pick a random location in the layout */ 138 /* pick a random location in the layout */
139 for (tries = 0; tries < 10; tries++) 139 for (tries = 0; tries < 10; tries++)
140 { 140 {
141 i = RANDOM () % (map->width - xsize - 2) + 1; 141 i = rndm (map->width - xsize - 2) + 1;
142 j = RANDOM () % (map->height - ysize - 2) + 1; 142 j = rndm (map->height - ysize - 2) + 1;
143 is_occupied = 0; 143 is_occupied = 0;
144 for (l = i; l < i + xsize; l++) 144 for (l = i; l < i + xsize; l++)
145 for (m = j; m < j + ysize; m++) 145 for (m = j; m < j + ysize; m++)
146 if (layout[l][m] == 'C' || layout[l][m] == '>' || layout[l][m] == '<') 146 if (layout[l][m] == 'C' || layout[l][m] == '>' || layout[l][m] == '<')
147 is_occupied |= 1; 147 is_occupied |= 1;
… …
158void 158void
159place_fountain_with_specials (maptile *map) 159place_fountain_with_specials (maptile *map)
160{ 160{
161 int ix, iy, i = -1, tries = 0; 161 int ix, iy, i = -1, tries = 0;
162 maptile *fountain_style = find_style ("/styles/misc", "fountains", -1); 162 maptile *fountain_style = find_style ("/styles/misc", "fountains", -1);
163
164 if (!fountain_style)
165 {
166 LOG (llevError, "unable to load stylemap /styles/misc fountains\n");
167 return;
168 }
169
163 object *fountain = get_archetype ("fountain"); 170 object *fountain = get_archetype ("fountain");
164 object *potion = object::create (); 171 object *potion = object::create ();
165 172
166 pick_random_object (fountain_style)->copy_to (potion); 173 pick_random_object (fountain_style)->copy_to (potion);
167 174
168 while (i < 0 && tries < 10) 175 while (i < 0 && tries < 10)
169 { 176 {
170 ix = RANDOM () % (map->width - 2) + 1; 177 ix = rndm (map->width - 2) + 1;
171 iy = RANDOM () % (map->height - 2) + 1; 178 iy = rndm (map->height - 2) + 1;
172 i = find_free_spot (fountain, map, ix, iy, 1, SIZEOFFREE1 + 1); 179 i = find_free_spot (fountain, map, ix, iy, 1, SIZEOFFREE1 + 1);
173 tries++; 180 tries++;
174 } 181 }
175 182
176 if (i == -1) 183 if (i == -1)
… …
186 SET_FLAG (potion, FLAG_NO_PICK); 193 SET_FLAG (potion, FLAG_NO_PICK);
187 SET_FLAG (potion, FLAG_IDENTIFIED); 194 SET_FLAG (potion, FLAG_IDENTIFIED);
188 potion->name = potion->name_pl = "fountain"; 195 potion->name = potion->name_pl = "fountain";
189 potion->x = ix; 196 potion->x = ix;
190 potion->y = iy; 197 potion->y = iy;
191 potion->material = M_ADAMANT; 198 potion->materialname = "adamantium";
192 fountain->x = ix; 199 fountain->x = ix;
193 fountain->y = iy; 200 fountain->y = iy;
194 insert_ob_in_map (fountain, map, NULL, 0); 201 insert_ob_in_map (fountain, map, NULL, 0);
195 insert_ob_in_map (potion, map, NULL, 0); 202 insert_ob_in_map (potion, map, NULL, 0);
196} 203}
… …
201 int ix, iy, i = -1; 208 int ix, iy, i = -1;
202 char buf[16384], *style, *decor, *mon; 209 char buf[16384], *style, *decor, *mon;
203 maptile *exit_style = find_style ("/styles/misc", "obscure_exits", -1); 210 maptile *exit_style = find_style ("/styles/misc", "obscure_exits", -1);
204 int g_xsize, g_ysize; 211 int g_xsize, g_ysize;
205 212
213 if (!exit_style)
214 {
215 LOG (llevError, "unabel to load stylemap /styles/misc obscure_exits\n");
216 return;
217 }
218
206 object *the_exit = object::create (); 219 object *the_exit = object::create ();
207 220
208 if (!exit_style) 221 if (!exit_style)
209 return; 222 return;
210 223
211 pick_random_object (exit_style)->copy_to (the_exit); 224 pick_random_object (exit_style)->copy_to (the_exit);
212 225
213 while (i < 0) 226 while (i < 0)
214 { 227 {
215 ix = RANDOM () % (map->width - 2) + 1; 228 ix = rndm (map->width - 2) + 1;
216 iy = RANDOM () % (map->height - 2) + 1; 229 iy = rndm (map->height - 2) + 1;
217 i = find_free_spot (the_exit, map, ix, iy, 1, SIZEOFFREE1 + 1); 230 i = find_free_spot (the_exit, map, ix, iy, 1, SIZEOFFREE1 + 1);
218 } 231 }
219 232
220 ix += freearr_x[i]; 233 ix += freearr_x[i];
221 iy += freearr_y[i]; 234 iy += freearr_y[i];
222 the_exit->x = ix; 235 the_exit->x = ix;
223 the_exit->y = iy; 236 the_exit->y = iy;
224 237
225 if (!hole_type) 238 if (!hole_type)
226 hole_type = RANDOM () % NR_OF_HOLE_TYPES + 1; 239 hole_type = rndm (NR_OF_HOLE_TYPES) + 1;
227 240
228 switch (hole_type) 241 switch (hole_type)
229 { 242 {
230 case GLORY_HOLE: /* treasures */ 243 case GLORY_HOLE: /* treasures */
231 { 244 {
… …
287{ 300{
288 maptile *special_map; 301 maptile *special_map;
289 int ix, iy; /* map insertion locatons */ 302 int ix, iy; /* map insertion locatons */
290 int special_type; /* type of special to make */ 303 int special_type; /* type of special to make */
291 304
292
293 special_type = RANDOM () % NUM_OF_SPECIAL_TYPES; 305 special_type = rndm (NUM_OF_SPECIAL_TYPES);
306
294 switch (special_type) 307 switch (special_type)
295 { 308 {
296 309 case SPECIAL_SUBMAP:
297 /* includes a special map into the random map being made. */ 310 /* includes a special map into the random map being made. */
298 case SPECIAL_SUBMAP:
299 {
300 special_map = find_style ("/styles/specialmaps", 0, RP->difficulty); 311 special_map = find_style ("/styles/specialmaps", 0, RP->difficulty);
312
301 if (special_map == NULL) 313 if (!special_map)
302 return; 314 return;
303 315
304 if (find_spot_for_submap (map, layout, &ix, &iy, special_map->width, special_map->height)) 316 if (find_spot_for_submap (map, layout, &ix, &iy, special_map->width, special_map->height))
305 include_map_in_map (map, special_map, ix, iy); 317 include_map_in_map (map, special_map, ix, iy);
318
306 break; 319 break;
307 }
308 320
321 case SPECIAL_FOUNTAIN:
309 /* Make a special fountain: an unpickable potion disguised as 322 /* Make a special fountain: an unpickable potion disguised as
310 a fountain, or rather, colocated with a fountain. */ 323 a fountain, or rather, colocated with a fountain. */
311 case SPECIAL_FOUNTAIN:
312 {
313 place_fountain_with_specials (map); 324 place_fountain_with_specials (map);
314 break; 325 break;
315 }
316 326
327 case SPECIAL_EXIT:
317 /* Make an exit to another random map, e.g. a gloryhole. */ 328 /* Make an exit to another random map, e.g. a gloryhole. */
318 case SPECIAL_EXIT:
319 {
320 place_special_exit (map, 0, RP); 329 place_special_exit (map, 0, RP);
321 break; 330 break;
322 }
323 } 331 }
324 332
325} 333}

Diff Legend

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