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.18 by root, Sun Dec 31 20:46:27 2006 UTC vs.
Revision 1.22 by root, Mon Jan 15 15:54:19 2007 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
7 7
8 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
302 if (downx == -1) 302 if (downx == -1)
303 find_in_layout (0, 0, &downx, &downy, maze, RP); 303 find_in_layout (0, 0, &downx, &downy, maze, RP);
304 304
305 if (the_exit_down) 305 if (the_exit_down)
306 { 306 {
307 char buf[8192]; 307 char buf[16384];
308 308
309 int i = find_first_free_spot (the_exit_down, map, downx, downy); 309 int i = find_free_spot (the_exit_down, map, downx, downy, 1, SIZEOFFREE1 + 1);
310 the_exit_down->x = downx + freearr_x[i]; 310 the_exit_down->x = downx + freearr_x[i];
311 the_exit_down->y = downy + freearr_y[i]; 311 the_exit_down->y = downy + freearr_y[i];
312 RP->origin_x = the_exit_down->x; 312 RP->origin_x = the_exit_down->x;
313 RP->origin_y = the_exit_down->y; 313 RP->origin_y = the_exit_down->y;
314 write_map_parameters_to_string (buf, RP); 314 write_map_parameters_to_string (buf, RP);
319 { 319 {
320 maptile *new_map; 320 maptile *new_map;
321 object *the_exit_back = arch_to_object (the_exit_up->arch); 321 object *the_exit_back = arch_to_object (the_exit_up->arch);
322 322
323 /* load it */ 323 /* load it */
324 if (!(new_map = maptile::load_map_sync (RP->final_map))) 324 if (!(new_map = maptile::find_sync (RP->final_map)))
325 return; 325 return;
326
327 new_map->load_sync ();
326 328
327 the_exit_down->slaying = RP->final_map; 329 the_exit_down->slaying = RP->final_map;
328 330
329 for (object *tmp = new_map->at (new_map->enter_x, new_map->enter_y).bot; tmp; tmp = tmp->above) 331 for (object *tmp = new_map->at (new_map->enter_x, new_map->enter_y).bot; tmp; tmp = tmp->above)
330 /* Remove exit back to previous random map. There should only be one 332 /* Remove exit back to previous random map. There should only be one

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines