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.5 by root, Thu Sep 14 21:16:12 2006 UTC vs.
Revision 1.11 by root, Mon Dec 25 14:54:44 2006 UTC

1
2/*
3 * static char *rcsid_exit_c =
4 * "$Id: exit.C,v 1.5 2006/09/14 21:16:12 root Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
10 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
22 16
23 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 20
27 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
28*/ 22*/
29 23
30#include <global.h> 24#include <global.h>
31#include <random_map.h> 25#include <random_map.h>
32#include <sproto.h> 26#include <sproto.h>
… …
127 5 means northward 121 5 means northward
128 6 means southward 122 6 means southward
129*/ 123*/
130 124
131void 125void
132place_exits (mapstruct *map, char **maze, char *exitstyle, int orientation, RMParms * RP) 126place_exits (maptile *map, char **maze, char *exitstyle, int orientation, RMParms * RP)
133{ 127{
134 char styledirname[256]; 128 char styledirname[256];
135 mapstruct *style_map_down = 0; /* harder maze */ 129 maptile *style_map_down = 0; /* harder maze */
136 mapstruct *style_map_up = 0; /* easier maze */ 130 maptile *style_map_up = 0; /* easier maze */
137 object *the_exit_down; /* harder maze */ 131 object *the_exit_down; /* harder maze */
138 object *the_exit_up; /* easier maze */ 132 object *the_exit_up; /* easier maze */
139 object *random_sign; /* magic mouth saying this is a random map. */ 133 object *random_sign; /* magic mouth saying this is a random map. */
140 char buf[512]; 134 char buf[512];
141 int cx = -1, cy = -1; /* location of a map center */ 135 int cx = -1, cy = -1; /* location of a map center */
… …
268 262
269 insert_ob_in_map (the_exit_up, map, NULL, 0); 263 insert_ob_in_map (the_exit_up, map, NULL, 0);
270 maze[the_exit_up->x][the_exit_up->y] = '<'; 264 maze[the_exit_up->x][the_exit_up->y] = '<';
271 265
272 /* set the starting x,y for this map */ 266 /* set the starting x,y for this map */
273 MAP_ENTER_X (map) = the_exit_up->x; 267 map->enter_x = the_exit_up->x;
274 MAP_ENTER_Y (map) = the_exit_up->y; 268 map->enter_y = the_exit_up->y;
275 269
276 /* first, look for a '>' character */ 270 /* first, look for a '>' character */
277 find_in_layout (0, '>', &downx, &downy, maze, RP); 271 find_in_layout (0, '>', &downx, &downy, maze, RP);
278 /* if no > is found use C */ 272 /* if no > is found use C */
279 if (downx == -1) 273 if (downx == -1)
… …
320 write_map_parameters_to_string (buf, RP); 314 write_map_parameters_to_string (buf, RP);
321 the_exit_down->msg = buf; 315 the_exit_down->msg = buf;
322 /* the identifier for making a random map. */ 316 /* the identifier for making a random map. */
323 if (RP->dungeon_level >= RP->dungeon_depth && RP->final_map[0] != 0) 317 if (RP->dungeon_level >= RP->dungeon_depth && RP->final_map[0] != 0)
324 { 318 {
325 mapstruct *new_map; 319 maptile *new_map;
326 object *the_exit_back = arch_to_object (the_exit_up->arch), *tmp; 320 object *the_exit_back = arch_to_object (the_exit_up->arch), *tmp;
327 321
328#if 0 322#if 0
329 /* I'm not sure if there was any reason to change the path to the 323 /* I'm not sure if there was any reason to change the path to the
330 * map other than to maybe make it more descriptive in the 'maps' 324 * map other than to maybe make it more descriptive in the 'maps'
… …
343 return; 337 return;
344 338
345 the_exit_down->slaying = RP->final_map; 339 the_exit_down->slaying = RP->final_map;
346 strcpy (new_map->path, RP->final_map); 340 strcpy (new_map->path, RP->final_map);
347 341
348 for (tmp = GET_MAP_OB (new_map, MAP_ENTER_X (new_map), MAP_ENTER_Y (new_map)); tmp; tmp = tmp->above) 342 for (tmp = GET_MAP_OB (new_map, new_map->enter_x, new_map->enter_y); tmp; tmp = tmp->above)
349 /* Remove exit back to previous random map. There should only be one 343 /* Remove exit back to previous random map. There should only be one
350 * which is why we break out. To try to process more than one 344 * which is why we break out. To try to process more than one
351 * would require keeping a 'next' pointer, ad free_object kills tmp, which 345 * would require keeping a 'next' pointer, ad free_object kills tmp, which
352 * breaks the for loop. 346 * breaks the for loop.
353 */ 347 */
354 if (tmp->type == EXIT && EXIT_PATH (tmp) && !strncmp (EXIT_PATH (tmp), "/random/", 8)) 348 if (tmp->type == EXIT && EXIT_PATH (tmp) && !strncmp (EXIT_PATH (tmp), "/random/", 8))
355 { 349 {
356 remove_ob (tmp); 350 tmp->remove ();
357 free_object (tmp); 351 tmp->destroy ();
358 break; 352 break;
359 } 353 }
360 354
361 if (final_map_exit == 1) 355 if (final_map_exit == 1)
362 { 356 {
363 /* setup the exit back */ 357 /* setup the exit back */
364 the_exit_back->slaying = map->path; 358 the_exit_back->slaying = map->path;
365 the_exit_back->stats.hp = the_exit_down->x; 359 the_exit_back->stats.hp = the_exit_down->x;
366 the_exit_back->stats.sp = the_exit_down->y; 360 the_exit_back->stats.sp = the_exit_down->y;
367 the_exit_back->x = MAP_ENTER_X (new_map); 361 the_exit_back->x = new_map->enter_x;
368 the_exit_back->y = MAP_ENTER_Y (new_map); 362 the_exit_back->y = new_map->enter_y;
369 363
370 insert_ob_in_map (the_exit_back, new_map, NULL, 0); 364 insert_ob_in_map (the_exit_back, new_map, NULL, 0);
371 } 365 }
372 366
373 set_map_timeout (new_map); /* So it gets swapped out */ 367 set_map_timeout (new_map); /* So it gets swapped out */
… …
388 382
389/* this function unblocks the exits. We blocked them to 383/* this function unblocks the exits. We blocked them to
390 keep things from being dumped on them during the other 384 keep things from being dumped on them during the other
391 phases of random map generation. */ 385 phases of random map generation. */
392void 386void
393unblock_exits (mapstruct *map, char **maze, RMParms * RP) 387unblock_exits (maptile *map, char **maze, RMParms * RP)
394{ 388{
395 int i = 0, j = 0; 389 int i = 0, j = 0;
396 object *walk; 390 object *walk;
397 391
398 for (i = 0; i < RP->Xsize; i++) 392 for (i = 0; i < RP->Xsize; i++)
399 for (j = 0; j < RP->Ysize; j++) 393 for (j = 0; j < RP->Ysize; j++)
400 if (maze[i][j] == '>' || maze[i][j] == '<') 394 if (maze[i][j] == '>' || maze[i][j] == '<')
401 { 395 {
402 for (walk = get_map_ob (map, i, j); walk != NULL; walk = walk->above) 396 for (walk = GET_MAP_OB (map, i, j); walk != NULL; walk = walk->above)
403 { 397 {
404 if (walk->move_block == MOVE_ALL && walk->type != LOCKED_DOOR) 398 if (walk->move_block == MOVE_ALL && walk->type != LOCKED_DOOR)
405 { 399 {
406 walk->move_block = MOVE_BLOCK_DEFAULT; 400 walk->move_block = MOVE_BLOCK_DEFAULT;
407 update_object (walk, UP_OBJ_CHANGE); 401 update_object (walk, UP_OBJ_CHANGE);

Diff Legend

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