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

Comparing deliantra/server/random_maps/exit.C (file contents):
Revision 1.11 by root, Mon Dec 25 14:54:44 2006 UTC vs.
Revision 1.12 by root, Sat Dec 30 10:16:11 2006 UTC

106 break; 106 break;
107 } 107 }
108 } 108 }
109} 109}
110 110
111
112
113
114
115
116/* orientation: 0 means random, 111/* orientation: 0 means random,
117 1 means descending dungeon 112 1 means descending dungeon
118 2 means ascending dungeon 113 2 means ascending dungeon
119 3 means rightward 114 3 means rightward
120 4 means leftward 115 4 means leftward
121 5 means northward 116 5 means northward
122 6 means southward 117 6 means southward
123*/ 118*/
124
125void 119void
126place_exits (maptile *map, char **maze, char *exitstyle, int orientation, RMParms * RP) 120place_exits (maptile *map, char **maze, char *exitstyle, int orientation, RMParms *RP)
127{ 121{
128 char styledirname[256]; 122 char styledirname[256];
129 maptile *style_map_down = 0; /* harder maze */ 123 maptile *style_map_down = 0; /* harder maze */
130 maptile *style_map_up = 0; /* easier maze */ 124 maptile *style_map_up = 0; /* easier maze */
131 object *the_exit_down; /* harder maze */ 125 object *the_exit_down; /* harder maze */
331 /* give the final map a name */ 325 /* give the final map a name */
332 sprintf (new_map_name, "%sfinal_map", RP->final_map); 326 sprintf (new_map_name, "%sfinal_map", RP->final_map);
333 /* set the exit down. */ 327 /* set the exit down. */
334#endif 328#endif
335 /* load it */ 329 /* load it */
336 if ((new_map = ready_map_name (RP->final_map, 0)) == NULL) 330 if (!(new_map = maptile::find_map (RP->final_map, 0)))
337 return; 331 return;
338 332
333 new_map->load ();
334
339 the_exit_down->slaying = RP->final_map; 335 the_exit_down->slaying = RP->final_map;
340 strcpy (new_map->path, RP->final_map);
341 336
342 for (tmp = GET_MAP_OB (new_map, new_map->enter_x, new_map->enter_y); tmp; tmp = tmp->above) 337 for (tmp = new_map->at (new_map->enter_x, new_map->enter_y).bot; tmp; tmp = tmp->above)
343 /* Remove exit back to previous random map. There should only be one 338 /* Remove exit back to previous random map. There should only be one
344 * which is why we break out. To try to process more than one 339 * which is why we break out. To try to process more than one
345 * would require keeping a 'next' pointer, ad free_object kills tmp, which 340 * would require keeping a 'next' pointer, ad free_object kills tmp, which
346 * breaks the for loop. 341 * breaks the for loop.
347 */ 342 */
348 if (tmp->type == EXIT && EXIT_PATH (tmp) && !strncmp (EXIT_PATH (tmp), "/random/", 8)) 343 if (tmp->type == EXIT && EXIT_PATH (tmp) && !strncmp (EXIT_PATH (tmp), "/random/", 8))
349 { 344 {
350 tmp->remove ();
351 tmp->destroy (); 345 tmp->destroy ();
352 break; 346 break;
353 } 347 }
354 348
355 if (final_map_exit == 1) 349 if (final_map_exit == 1)
376 } 370 }
377 } 371 }
378 372
379} 373}
380 374
381
382
383/* this function unblocks the exits. We blocked them to 375/* this function unblocks the exits. We blocked them to
384 keep things from being dumped on them during the other 376 keep things from being dumped on them during the other
385 phases of random map generation. */ 377 phases of random map generation. */
386void 378void
387unblock_exits (maptile *map, char **maze, RMParms * RP) 379unblock_exits (maptile *map, char **maze, RMParms * RP)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines