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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.55 by root, Wed Dec 27 18:09:48 2006 UTC vs.
Revision 1.56 by root, Sat Dec 30 10:16:10 2006 UTC

26 26
27#include <loader.h> 27#include <loader.h>
28#include <unistd.h> 28#include <unistd.h>
29 29
30#include "path.h" 30#include "path.h"
31
32/*
33 * Returns the maptile which has a name matching the given argument.
34 * return NULL if no match is found.
35 */
36maptile *
37has_been_loaded (const char *name)
38{
39 if (!name || !*name)
40 return 0;
41
42 for_all_maps (map)
43 if (!strcmp (name, map->path))
44 return map;
45
46 return 0;
47}
48 31
49/* 32/*
50 * This makes a path absolute outside the world of Crossfire. 33 * This makes a path absolute outside the world of Crossfire.
51 * In other words, it prepends LIBDIR/MAPDIR/ to the given path 34 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
52 * and returns the pointer to a static array containing the result. 35 * and returns the pointer to a static array containing the result.
53 * it really should be called create_mapname 36 * it really should be called create_mapname
54 */ 37 */
55
56const char * 38const char *
57create_pathname (const char *name) 39create_pathname (const char *name)
58{ 40{
59 static char buf[MAX_BUF]; 41 static char buf[MAX_BUF];
60 42
69} 51}
70 52
71/* 53/*
72 * same as create_pathname, but for the overlay maps. 54 * same as create_pathname, but for the overlay maps.
73 */ 55 */
74
75const char * 56const char *
76create_overlay_pathname (const char *name) 57create_overlay_pathname (const char *name)
77{ 58{
78 static char buf[MAX_BUF]; 59 static char buf[MAX_BUF];
79 60
88} 69}
89 70
90/* 71/*
91 * same as create_pathname, but for the template maps. 72 * same as create_pathname, but for the template maps.
92 */ 73 */
93
94const char * 74const char *
95create_template_pathname (const char *name) 75create_template_pathname (const char *name)
96{ 76{
97 static char buf[MAX_BUF]; 77 static char buf[MAX_BUF];
98 78
129 else 109 else
130 *t = *s; 110 *t = *s;
131 *t = 0; 111 *t = 0;
132 return (buf); 112 return (buf);
133} 113}
134
135 114
136/* 115/*
137 * This function checks if a file with the given path exists. 116 * This function checks if a file with the given path exists.
138 * -1 is returned if it fails, otherwise the mode of the file 117 * -1 is returned if it fails, otherwise the mode of the file
139 * is returned. 118 * is returned.
146 * the rest of the code only cares that the file is readable. 125 * the rest of the code only cares that the file is readable.
147 * when the editor goes away, the call to stat should probably be 126 * when the editor goes away, the call to stat should probably be
148 * replaced by an access instead (similar to the windows one, but 127 * replaced by an access instead (similar to the windows one, but
149 * that seems to be missing the prepend_dir processing 128 * that seems to be missing the prepend_dir processing
150 */ 129 */
151
152int 130int
153check_path (const char *name, int prepend_dir) 131check_path (const char *name, int prepend_dir)
154{ 132{
155 char buf[MAX_BUF]; 133 char buf[MAX_BUF];
156 134
182 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || 160 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
183 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH)) 161 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
184 mode |= 2; 162 mode |= 2;
185 163
186 return (mode); 164 return (mode);
187}
188
189/*
190 * Prints out debug-information about a map.
191 * Dumping these at llevError doesn't seem right, but is
192 * necessary to make sure the information is in fact logged.
193 */
194
195void
196dump_map (const maptile *m)
197{
198 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
199 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y);
200
201 if (m->msg != NULL)
202 LOG (llevError, "Message:\n%s", m->msg);
203
204 if (m->maplore != NULL)
205 LOG (llevError, "Lore:\n%s", m->maplore);
206
207 if (m->tmpname != NULL)
208 LOG (llevError, "Tmpname: %s\n", m->tmpname);
209
210 LOG (llevError, "Difficulty: %d\n", m->difficulty);
211 LOG (llevError, "Darkness: %d\n", m->darkness);
212}
213
214/*
215 * Prints out debug-information about all maps.
216 * This basically just goes through all the maps and calls
217 * dump_map on each one.
218 */
219
220void
221dump_all_maps (void)
222{
223 for_all_maps (m)
224 dump_map (m);
225} 165}
226 166
227/* This rolls up wall, blocks_magic, blocks_view, etc, all into 167/* This rolls up wall, blocks_magic, blocks_view, etc, all into
228 * one function that just returns a P_.. value (see map.h) 168 * one function that just returns a P_.. value (see map.h)
229 * it will also do map translation for tiled maps, returning 169 * it will also do map translation for tiled maps, returning
235 * don't expect to insert/remove anything from those spaces. 175 * don't expect to insert/remove anything from those spaces.
236 */ 176 */
237int 177int
238get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) 178get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
239{ 179{
240 sint16 newx, newy;
241 int retval = 0;
242 maptile *mp;
243
244 newx = x; 180 sint16 newx = x;
245 newy = y; 181 sint16 newy = y;
246 182
247 mp = get_map_from_coord (oldmap, &newx, &newy); 183 maptile *mp = get_map_from_coord (oldmap, &newx, &newy);
248 184
249 if (!mp) 185 if (!mp)
250 return P_OUT_OF_MAP; 186 return P_OUT_OF_MAP;
251
252 if (mp != oldmap)
253 retval |= P_NEW_MAP;
254 187
255 if (newmap) *newmap = mp; 188 if (newmap) *newmap = mp;
256 if (nx) *nx = newx; 189 if (nx) *nx = newx;
257 if (ny) *ny = newy; 190 if (ny) *ny = newy;
258 191
259 return retval | mp->at (newx, newy).flags (); 192 return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
260} 193}
261 194
262/* 195/*
263 * Returns true if the given coordinate is blocked except by the 196 * Returns true if the given coordinate is blocked except by the
264 * object passed is not blocking. This is used with 197 * object passed is not blocking. This is used with
419 if (flag & P_IS_ALIVE) 352 if (flag & P_IS_ALIVE)
420 return P_IS_ALIVE; 353 return P_IS_ALIVE;
421 354
422 mapspace &ms = m1->at (sx, sy); 355 mapspace &ms = m1->at (sx, sy);
423 356
424
425 /* find_first_free_spot() calls this function. However, often 357 /* find_first_free_spot() calls this function. However, often
426 * ob doesn't have any move type (when used to place exits) 358 * ob doesn't have any move type (when used to place exits)
427 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 359 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
428 */ 360 */
429 361
444 * into inventory, but just links them. What this does is go through 376 * into inventory, but just links them. What this does is go through
445 * and insert them properly. 377 * and insert them properly.
446 * The object 'container' is the object that contains the inventory. 378 * The object 'container' is the object that contains the inventory.
447 * This is needed so that we can update the containers weight. 379 * This is needed so that we can update the containers weight.
448 */ 380 */
449
450void 381void
451fix_container (object *container) 382fix_container (object *container)
452{ 383{
453 object *tmp = container->inv, *next; 384 object *tmp = container->inv, *next;
454 385
455 container->inv = NULL; 386 container->inv = 0;
456 while (tmp != NULL) 387 while (tmp)
457 { 388 {
458 next = tmp->below; 389 next = tmp->below;
459 if (tmp->inv) 390 if (tmp->inv)
460 fix_container (tmp); 391 fix_container (tmp);
392
461 (void) insert_ob_in_ob (tmp, container); 393 insert_ob_in_ob (tmp, container);
462 tmp = next; 394 tmp = next;
463 } 395 }
396
464 /* sum_weight will go through and calculate what all the containers are 397 /* sum_weight will go through and calculate what all the containers are
465 * carrying. 398 * carrying.
466 */ 399 */
467 sum_weight (container); 400 sum_weight (container);
468} 401}
471 * for objects whose arch says they are multipart yet according to the 404 * for objects whose arch says they are multipart yet according to the
472 * info we have, they only have the head (as would be expected when 405 * info we have, they only have the head (as would be expected when
473 * they are saved). We do have to look for the old maps that did save 406 * they are saved). We do have to look for the old maps that did save
474 * the more sections and not re-add sections for them. 407 * the more sections and not re-add sections for them.
475 */ 408 */
476static void 409void
477link_multipart_objects (maptile *m) 410maptile::link_multipart_objects ()
478{ 411{
479 int x, y; 412 if (!spaces)
480 object *tmp, *op, *last, *above; 413 return;
481 archetype *at;
482 414
483 for (x = 0; x < m->width; x++) 415 for (mapspace *ms = spaces + size (); ms-- > spaces; )
484 for (y = 0; y < m->height; y++) 416 for (object *tmp = ms->bot; tmp; )
485 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
486 { 417 {
487 above = tmp->above; 418 object *above = tmp->above;
488 419
489 /* already multipart - don't do anything more */ 420 /* already multipart - don't do anything more */
490 if (tmp->head || tmp->more) 421 if (!tmp->head && !tmp->more)
491 continue; 422 {
492
493 /* If there is nothing more to this object, this for loop 423 /* If there is nothing more to this object, this for loop
494 * won't do anything. 424 * won't do anything.
495 */ 425 */
496 for (at = tmp->arch->more, last = tmp; at != NULL; at = at->more, last = op) 426 archetype *at;
427 object *last, *op;
428 for (at = tmp->arch->more, last = tmp;
429 at;
430 at = at->more, last = op)
497 { 431 {
498 op = arch_to_object (at); 432 op = arch_to_object (at);
499 433
500 /* update x,y coordinates */ 434 /* update x,y coordinates */
501 op->x += tmp->x; 435 op->x += tmp->x;
502 op->y += tmp->y; 436 op->y += tmp->y;
503 op->head = tmp; 437 op->head = tmp;
504 op->map = m; 438 op->map = this;
505 last->more = op; 439 last->more = op;
506 op->name = tmp->name; 440 op->name = tmp->name;
507 op->title = tmp->title; 441 op->title = tmp->title;
442
508 /* we could link all the parts onto tmp, and then just 443 /* we could link all the parts onto tmp, and then just
509 * call insert_ob_in_map once, but the effect is the same, 444 * call insert_ob_in_map once, but the effect is the same,
510 * as insert_ob_in_map will call itself with each part, and 445 * as insert_ob_in_map will call itself with each part, and
511 * the coding is simpler to just to it here with each part. 446 * the coding is simpler to just to it here with each part.
512 */ 447 */
513 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 448 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
514 } /* for at = tmp->arch->more */ 449 }
515 } /* for objects on this space */ 450 }
451
452 tmp = above;
453 }
516} 454}
517 455
518/* 456/*
519 * Loads (ands parses) the objects into a given map from the specified 457 * Loads (ands parses) the objects into a given map from the specified
520 * file pointer. 458 * file pointer.
521 * mapflags is the same as we get with load_original_map 459 * mapflags is the same as we get with load_original_map
522 */ 460 */
523void 461bool
524load_objects (maptile *m, object_thawer & fp, int mapflags) 462maptile::load_objects (object_thawer &thawer)
525{ 463{
526 int i, j;
527 int unique; 464 int unique;
528 object *op, *prev = NULL, *last_more = NULL, *otmp; 465 object *op, *prev = NULL, *last_more = NULL, *otmp;
529 466
530 op = object::create (); 467 op = object::create ();
531 op->map = m; /* To handle buttons correctly */ 468 op->map = this; /* To handle buttons correctly */
532 469
533 while ((i = load_object (fp, op, mapflags))) 470 while (int i = load_object (thawer, op, 0))
534 { 471 {
535 /* if the archetype for the object is null, means that we 472 /* if the archetype for the object is null, means that we
536 * got an invalid object. Don't do anything with it - the game 473 * got an invalid object. Don't do anything with it - the game
537 * or editor will not be able to do anything with it either. 474 * or editor will not be able to do anything with it either.
538 */ 475 */
543 } 480 }
544 481
545 switch (i) 482 switch (i)
546 { 483 {
547 case LL_NORMAL: 484 case LL_NORMAL:
548 /* if we are loading an overlay, put the floors on the bottom */
549 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
550 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
551 else
552 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 485 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
553 486
554 if (op->inv) 487 if (op->inv)
555 sum_weight (op); 488 sum_weight (op);
556 489
557 prev = op, last_more = op; 490 prev = op, last_more = op;
558 break; 491 break;
559 492
560 case LL_MORE: 493 case LL_MORE:
561 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 494 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
562 op->head = prev, last_more->more = op, last_more = op; 495 op->head = prev, last_more->more = op, last_more = op;
563 break; 496 break;
564 } 497 }
565 498
566 if (mapflags & MAP_STYLE)
567 remove_from_active_list (op);
568
569 op = object::create (); 499 op = object::create ();
570 op->map = m; 500 op->map = this;
571 }
572
573 for (i = 0; i < m->width; i++)
574 {
575 for (j = 0; j < m->height; j++)
576 {
577 unique = 0;
578 /* check for unique items, or unique squares */
579 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
580 {
581 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
582 unique = 1;
583
584 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
585 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
586 }
587 }
588 } 501 }
589 502
590 op->destroy (); 503 op->destroy ();
591 link_multipart_objects (m);
592}
593 504
594/* This saves all the objects on the map in a non destructive fashion. 505#if 0
595 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
596 * and we only save the head of multi part objects - this is needed
597 * in order to do map tiling properly.
598 */
599void
600save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
601{
602 int i, j = 0, unique = 0;
603 object *op;
604
605 /* first pass - save one-part objects */
606 for (i = 0; i < m->width; i++) 506 for (i = 0; i < width; i++)
607 for (j = 0; j < m->height; j++) 507 for (j = 0; j < height; j++)
608 { 508 {
609 unique = 0; 509 unique = 0;
610 510 /* check for unique items, or unique squares */
611 for (op = m->at (i, j).bot; op; op = op->above) 511 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
612 { 512 {
613 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 513 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
614 unique = 1; 514 unique = 1;
615 515
616 if (!op->can_map_save ()) 516 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
617 continue; 517 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
618
619 if (unique || op->flag [FLAG_UNIQUE])
620 save_object (fp2, op, 1);
621 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
622 save_object (fp, op, 1);
623 } 518 }
624 } 519 }
520#endif
521
522 return true;
523}
524
525void
526maptile::activate ()
527{
528 if (!spaces)
529 return;
530
531 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1);
534}
535
536void
537maptile::deactivate ()
538{
539 if (!spaces)
540 return;
541
542 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1);
545}
546
547bool
548maptile::save_objects (object_freezer &freezer, int flags)
549{
550 if (flags & IO_HEADER)
551 save_header (freezer);
552
553 if (!spaces)
554 return false;
555
556 for (int i = 0; i < size (); ++i)
557 {
558 int unique = 0;
559 for (object *op = spaces [i].bot; op; op = op->above)
560 {
561 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
562 unique = 1;
563
564 if (!op->can_map_save ())
565 continue;
566
567 if (unique || op->flag [FLAG_UNIQUE])
568 {
569 if (flags & IO_UNIQUES)
570 save_object (freezer, op, 1);
571 }
572 else if (flags & IO_OBJECTS)
573 save_object (freezer, op, 1);
574 }
575 }
576
577 return true;
578}
579
580bool
581maptile::load_objects (const char *path, bool skip_header)
582{
583 object_thawer thawer (path);
584
585 if (!thawer)
586 return false;
587
588 if (skip_header)
589 for (;;)
590 {
591 keyword kw = thawer.get_kv ();
592
593 if (kw == KW_end)
594 break;
595
596 thawer.skip_kv (kw);
597 }
598
599 return load_objects (thawer);
600}
601
602bool
603maptile::save_objects (const char *path, int flags)
604{
605 object_freezer freezer;
606
607 if (!save_objects (freezer, flags))
608 return false;
609
610 return freezer.save (path);
625} 611}
626 612
627maptile::maptile () 613maptile::maptile ()
628{ 614{
629 in_memory = MAP_SWAPPED; 615 in_memory = MAP_SWAPPED;
635 height = 16; 621 height = 16;
636 reset_timeout = 0; 622 reset_timeout = 0;
637 timeout = 300; 623 timeout = 300;
638 enter_x = 0; 624 enter_x = 0;
639 enter_y = 0; 625 enter_y = 0;
640 /*set part to -1 indicating conversion to weather map not yet done */
641 worldpartx = -1;
642 worldparty = -1;
643} 626}
644 627
645void 628maptile::maptile (int w, int h)
646maptile::link ()
647{ 629{
648 next = first_map; 630 in_memory = MAP_SWAPPED;
649 first_map = this;
650}
651 631
652void 632 width = w;
653maptile::unlink () 633 height = h;
654{ 634 reset_timeout = 0;
655 if (first_map == this) 635 timeout = 300;
656 first_map = next; 636 enter_x = 0;
657 else 637 enter_y = 0;
658 {
659 for_all_maps (m)
660 if (m->next = this)
661 {
662 m->next = next;
663 return;
664 }
665 638
666 LOG (llevError, "maptile::unlink() map not on list: %s\n", path); 639 alloc ();
667 }
668}
669
670/*
671 * Allocates, initialises, and returns a pointer to a maptile.
672 * Modified to no longer take a path option which was not being
673 * used anyways. MSW 2001-07-01
674 */
675maptile *
676get_linked_map (void)
677{
678 maptile *map = new maptile;
679 map->link ();
680 return map;
681} 640}
682 641
683/* 642/*
684 * Allocates the arrays contained in a maptile. 643 * Allocates the arrays contained in a maptile.
685 * This basically allocates the dynamic array of spaces for the 644 * This basically allocates the dynamic array of spaces for the
686 * map. 645 * map.
687 */ 646 */
688void 647void
689maptile::allocate () 648maptile::alloc ()
690{ 649{
691 in_memory = MAP_IN_MEMORY;
692
693 /* Log this condition and free the storage. We could I suppose
694 * realloc, but if the caller is presuming the data will be intact,
695 * that is their poor assumption.
696 */
697 if (spaces) 650 if (spaces)
698 { 651 return;
699 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
700 sfree (spaces, size ());
701 }
702 652
703 spaces = salloc0<mapspace> (size ()); 653 spaces = salloc0<mapspace> (size ());
704}
705
706/* Create and returns a map of the specific size. Used
707 * in random map code and the editor.
708 */
709maptile *
710get_empty_map (int sizex, int sizey)
711{
712 maptile *m = get_linked_map ();
713
714 m->width = sizex;
715 m->height = sizey;
716 m->in_memory = MAP_SWAPPED;
717
718 m->allocate ();
719
720 return m;
721} 654}
722 655
723/* Takes a string from a map definition and outputs a pointer to the array of shopitems 656/* Takes a string from a map definition and outputs a pointer to the array of shopitems
724 * corresponding to that string. Memory is allocated for this, it must be freed 657 * corresponding to that string. Memory is allocated for this, it must be freed
725 * at a later date. 658 * at a later date.
841 * put all the stuff in the map object so that names actually make 774 * put all the stuff in the map object so that names actually make
842 * sense. 775 * sense.
843 * This could be done in lex (like the object loader), but I think 776 * This could be done in lex (like the object loader), but I think
844 * currently, there are few enough fields this is not a big deal. 777 * currently, there are few enough fields this is not a big deal.
845 * MSW 2001-07-01 778 * MSW 2001-07-01
846 * return 0 on success, 1 on failure.
847 */ 779 */
848 780bool
849static int 781maptile::load_header (object_thawer &thawer)
850load_map_header (object_thawer & fp, maptile *m)
851{ 782{
852 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; 783 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
853 int msgpos = 0; 784 int msgpos = 0;
854 int maplorepos = 0; 785 int maplorepos = 0;
855 786
856 while (fgets (buf, HUGE_BUF, fp) != NULL) 787 for (;;)
857 { 788 {
858 buf[HUGE_BUF - 1] = 0; 789 keyword kw = thawer.get_kv ();
859 key = buf;
860 790
861 while (isspace (*key)) 791 switch (kw)
862 key++;
863
864 if (*key == 0)
865 continue; /* empty line */
866
867 value = strchr (key, ' ');
868
869 if (!value)
870 { 792 {
871 if ((end = strchr (key, '\n'))) 793 case KW_EOF:
872 *end = 0; 794 LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path);
795 return false;
796
797 case KW_end:
798 return true;
799
800 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg);
802 break;
803
804 case KW_lore: // CF+ extension
805 thawer.get_ml (KW_endlore, maplore);
806 break;
807
808 case KW_maplore:
809 thawer.get_ml (KW_endmaplore, maplore);
810 break;
811
812 case KW_arch:
813 if (strcmp (thawer.get_str (), "map"))
814 LOG (llevError, "%s: loading map and got a non 'arch map' line (arch %s), skipping.\n", &path, thawer.get_str ());
815 break;
816
817 case KW_oid:
818 thawer.get (this, thawer.get_sint32 ());
819 break;
820
821 case KW_file_format_version: break; // nop
822
823 case KW_name: thawer.get (name); break;
824 case KW_attach: thawer.get (attach); break;
825 case KW_reset_time: thawer.get (reset_time); break;
826 case KW_shopgreed: thawer.get (shopgreed); break;
827 case KW_shopmin: thawer.get (shopmin); break;
828 case KW_shopmax: thawer.get (shopmax); break;
829 case KW_shoprace: thawer.get (shoprace); break;
830 case KW_outdoor: thawer.get (outdoor); break;
831 case KW_temp: thawer.get (temp); break;
832 case KW_pressure: thawer.get (pressure); break;
833 case KW_humid: thawer.get (humid); break;
834 case KW_windspeed: thawer.get (windspeed); break;
835 case KW_winddir: thawer.get (winddir); break;
836 case KW_sky: thawer.get (sky); break;
837
838 case KW_per_player: thawer.get (per_player); break;
839 case KW_per_party: thawer.get (per_party); break;
840
841 case KW_region: get_region_by_name (thawer.get_str ()); break;
842 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
843
844 // old names new names
845 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
846 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
847 case KW_x: case KW_width: thawer.get (width); break;
848 case KW_y: case KW_height: thawer.get (height); break;
849 case KW_weight: case KW_reset_timeout: thawer.get (reset_timeout); break;
850 case KW_value: case KW_swap_time: thawer.get (timeout); break;
851 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
852 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
853 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
854
855 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break;
859
860 default:
861 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
862 break;
873 } 863 }
874 else
875 {
876 *value = 0;
877 value++;
878 end = strchr (value, '\n');
879
880 while (isspace (*value))
881 {
882 value++;
883
884 if (*value == '\0' || value == end)
885 {
886 /* Nothing but spaces. */
887 value = NULL;
888 break;
889 }
890 }
891 }
892
893 if (!end)
894 {
895 LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
896 return 1;
897 }
898
899 /* key is the field name, value is what it should be set
900 * to. We've already done the work to null terminate key,
901 * and strip off any leading spaces for both of these.
902 * We have not touched the newline at the end of the line -
903 * these are needed for some values. the end pointer
904 * points to the first of the newlines.
905 * value could be NULL! It would be easy enough to just point
906 * this to "" to prevent cores, but that would let more errors slide
907 * through.
908 *
909 * First check for entries that do not use the value parameter, then
910 * validate that value is given and check for the remaining entries
911 * that use the parameter.
912 */
913
914 if (!strcmp (key, "msg"))
915 {
916 while (fgets (buf, HUGE_BUF, fp) != NULL)
917 {
918 if (!strcmp (buf, "endmsg\n"))
919 break;
920 else
921 {
922 /* slightly more efficient than strcat */
923 strcpy (msgbuf + msgpos, buf);
924 msgpos += strlen (buf);
925 }
926 }
927 /* There are lots of maps that have empty messages (eg, msg/endmsg
928 * with nothing between). There is no reason in those cases to
929 * keep the empty message. Also, msgbuf contains garbage data
930 * when msgpos is zero, so copying it results in crashes
931 */
932 if (msgpos != 0)
933 m->msg = strdup (msgbuf);
934 }
935 else if (!strcmp (key, "maplore"))
936 {
937 while (fgets (buf, HUGE_BUF, fp) != NULL)
938 {
939 if (!strcmp (buf, "endmaplore\n"))
940 break;
941 else
942 {
943 /* slightly more efficient than strcat */
944 strcpy (maplorebuf + maplorepos, buf);
945 maplorepos += strlen (buf);
946 }
947 }
948 if (maplorepos != 0)
949 m->maplore = strdup (maplorebuf);
950 }
951 else if (!strcmp (key, "end"))
952 {
953 break;
954 }
955 else if (value == NULL)
956 {
957 LOG (llevError, "Got '%s' line without parameter in map header\n", key);
958 }
959 else if (!strcmp (key, "arch"))
960 {
961 /* This is an oddity, but not something we care about much. */
962 if (strcmp (value, "map\n"))
963 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
964 }
965 else if (!strcmp (key, "name"))
966 {
967 *end = 0;
968 m->name = strdup (value);
969 }
970 /* first strcmp value on these are old names supported
971 * for compatibility reasons. The new values (second) are
972 * what really should be used.
973 */
974 else if (!strcmp (key, "oid"))
975 fp.get (m, atoi (value));
976 else if (!strcmp (key, "attach"))
977 m->attach = value;
978 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
979 m->enter_x = atoi (value);
980 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
981 m->enter_y = atoi (value);
982 else if (!strcmp (key, "x") || !strcmp (key, "width"))
983 m->width = atoi (value);
984 else if (!strcmp (key, "y") || !strcmp (key, "height"))
985 m->height = atoi (value);
986 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
987 m->reset_timeout = atoi (value);
988 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
989 m->timeout = atoi (value);
990 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
991 m->difficulty = clamp (atoi (value), 1, settings.max_level);
992 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
993 m->darkness = atoi (value);
994 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
995 m->fixed_resettime = atoi (value);
996 else if (!strcmp (key, "unique"))
997 m->unique = atoi (value);
998 else if (!strcmp (key, "template"))
999 m->templatemap = atoi (value);
1000 else if (!strcmp (key, "region"))
1001 m->region = get_region_by_name (value);
1002 else if (!strcmp (key, "shopitems"))
1003 {
1004 *end = 0;
1005 m->shopitems = parse_shop_string (value);
1006 }
1007 else if (!strcmp (key, "shopgreed"))
1008 m->shopgreed = atof (value);
1009 else if (!strcmp (key, "shopmin"))
1010 m->shopmin = atol (value);
1011 else if (!strcmp (key, "shopmax"))
1012 m->shopmax = atol (value);
1013 else if (!strcmp (key, "shoprace"))
1014 {
1015 *end = 0;
1016 m->shoprace = strdup (value);
1017 }
1018 else if (!strcmp (key, "outdoor"))
1019 m->outdoor = atoi (value);
1020 else if (!strcmp (key, "temp"))
1021 m->temp = atoi (value);
1022 else if (!strcmp (key, "pressure"))
1023 m->pressure = atoi (value);
1024 else if (!strcmp (key, "humid"))
1025 m->humid = atoi (value);
1026 else if (!strcmp (key, "windspeed"))
1027 m->windspeed = atoi (value);
1028 else if (!strcmp (key, "winddir"))
1029 m->winddir = atoi (value);
1030 else if (!strcmp (key, "sky"))
1031 m->sky = atoi (value);
1032 else if (!strcmp (key, "nosmooth"))
1033 m->nosmooth = atoi (value);
1034 else if (!strncmp (key, "tile_path_", 10))
1035 {
1036 int tile = atoi (key + 10);
1037
1038 if (tile < 1 || tile > 4)
1039 {
1040 LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
1041 }
1042 else
1043 {
1044 char *path;
1045
1046 *end = 0;
1047
1048 if (m->tile_path[tile - 1])
1049 {
1050 LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
1051 free (m->tile_path[tile - 1]);
1052 m->tile_path[tile - 1] = NULL;
1053 }
1054
1055 if (check_path (value, 1) != -1)
1056 {
1057 /* The unadorned path works. */
1058 path = value;
1059 }
1060 else
1061 {
1062 /* Try again; it could be a relative exit. */
1063
1064 path = path_combine_and_normalize (m->path, value);
1065
1066 if (check_path (path, 1) == -1)
1067 {
1068 LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
1069 path = NULL;
1070 }
1071 }
1072
1073 if (editor)
1074 {
1075 /* Use the value as in the file. */
1076 m->tile_path[tile - 1] = strdup (value);
1077 }
1078 else if (path != NULL)
1079 {
1080 /* Use the normalized value. */
1081 m->tile_path[tile - 1] = strdup (path);
1082 }
1083 } /* end if tile direction (in)valid */
1084 }
1085 else
1086 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1087 }
1088
1089 if (!key || strcmp (key, "end"))
1090 { 864 }
1091 LOG (llevError, "Got premature eof on map header!\n");
1092 return 1;
1093 }
1094 865
1095 return 0; 866 abort ();
1096} 867}
1097 868
1098/* 869bool
1099 * Opens the file "filename" and reads information about the map 870maptile::load_header (const char *path)
1100 * from the given file, and stores it in a newly allocated
1101 * maptile. A pointer to this structure is returned, or NULL on failure.
1102 * flags correspond to those in map.h. Main ones used are
1103 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1104 * MAP_BLOCK, in which case we block on this load. This happens in all
1105 * cases, no matter if this flag is set or not.
1106 * MAP_STYLE: style map - don't add active objects, don't add to server
1107 * managed map list.
1108 */
1109maptile *
1110load_original_map (const char *filename, int flags)
1111{ 871{
1112 maptile *m;
1113 char pathname[MAX_BUF];
1114
1115 if (flags & MAP_PLAYER_UNIQUE)
1116 strcpy (pathname, filename);
1117 else if (flags & MAP_OVERLAY)
1118 strcpy (pathname, create_overlay_pathname (filename));
1119 else
1120 strcpy (pathname, create_pathname (filename));
1121
1122 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1123
1124 object_thawer thawer (pathname); 872 object_thawer thawer (path);
1125 873
1126 if (!thawer) 874 if (!thawer)
1127 return 0; 875 return false;
1128 876
1129 m = get_linked_map (); 877 return load_header (thawer);
1130
1131 strcpy (m->path, filename);
1132 if (load_map_header (thawer, m))
1133 {
1134 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1135 delete_map (m);
1136 return 0;
1137 }
1138
1139 m->allocate ();
1140
1141 m->in_memory = MAP_LOADING;
1142 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1143
1144 m->in_memory = MAP_IN_MEMORY;
1145 if (!m->difficulty)
1146 m->difficulty = calculate_difficulty (m);
1147 set_map_reset_time (m);
1148 m->instantiate ();
1149 return (m);
1150}
1151
1152/*
1153 * Loads a map, which has been loaded earlier, from file.
1154 * Return the map object we load into (this can change from the passed
1155 * option if we can't find the original map)
1156 */
1157static maptile *
1158load_temporary_map (maptile *m)
1159{
1160 char buf[MAX_BUF];
1161
1162 if (!m->tmpname)
1163 {
1164 LOG (llevError, "No temporary filename for map %s\n", m->path);
1165 strcpy (buf, m->path);
1166 delete_map (m);
1167 m = load_original_map (buf, 0);
1168 if (m == NULL)
1169 return NULL;
1170 fix_auto_apply (m); /* Chests which open as default */
1171 return m;
1172 }
1173
1174 object_thawer thawer (m->tmpname);
1175
1176 if (!thawer)
1177 {
1178 strcpy (buf, m->path);
1179 delete_map (m);
1180 m = load_original_map (buf, 0);
1181 if (!m)
1182 return NULL;
1183 fix_auto_apply (m); /* Chests which open as default */
1184 return m;
1185 }
1186
1187 if (load_map_header (thawer, m))
1188 {
1189 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1190 delete_map (m);
1191 m = load_original_map (m->path, 0);
1192 return NULL;
1193 }
1194
1195 m->allocate ();
1196
1197 m->in_memory = MAP_LOADING;
1198 load_objects (m, thawer, 0);
1199
1200 m->in_memory = MAP_IN_MEMORY;
1201 INVOKE_MAP (SWAPIN, m);
1202 return m;
1203}
1204
1205/*
1206 * Loads a map, which has been loaded earlier, from file.
1207 * Return the map object we load into (this can change from the passed
1208 * option if we can't find the original map)
1209 */
1210maptile *
1211load_overlay_map (const char *filename, maptile *m)
1212{
1213 char pathname[MAX_BUF];
1214
1215 strcpy (pathname, create_overlay_pathname (filename));
1216
1217 object_thawer thawer (pathname);
1218
1219 if (!thawer)
1220 return m;
1221
1222 if (load_map_header (thawer, m))
1223 {
1224 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1225 delete_map (m);
1226 m = load_original_map (m->path, 0);
1227 return 0;
1228 }
1229 /*m->allocate ();*/
1230
1231 m->in_memory = MAP_LOADING;
1232 load_objects (m, thawer, MAP_OVERLAY);
1233
1234 m->in_memory = MAP_IN_MEMORY;
1235 return m;
1236} 878}
1237 879
1238/****************************************************************************** 880/******************************************************************************
1239 * This is the start of unique map handling code 881 * This is the start of unique map handling code
1240 *****************************************************************************/ 882 *****************************************************************************/
1241 883
1242/* This goes through map 'm' and removed any unique items on the map. */ 884/* This goes through the maptile and removed any unique items on the map. */
1243static void 885void
1244delete_unique_items (maptile *m) 886maptile::clear_unique_items ()
1245{ 887{
1246 int i, j, unique; 888 for (int i = 0; i < size (); ++i)
1247 object *op, *next;
1248
1249 for (i = 0; i < m->width; i++)
1250 for (j = 0; j < m->height; j++)
1251 { 889 {
1252 unique = 0; 890 int unique = 0;
1253 891 for (object *op = spaces [i].bot; op; )
1254 for (op = GET_MAP_OB (m, i, j); op; op = next)
1255 { 892 {
1256 next = op->above; 893 object *above = op->above;
1257 894
1258 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 895 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1259 unique = 1; 896 unique = 1;
1260 897
1261 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 898 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1262 { 899 {
1263 op->destroy_inv (false); 900 op->destroy_inv (false);
1264 op->destroy (); 901 op->destroy ();
1265 } 902 }
1266 }
1267 }
1268}
1269 903
1270/* 904 op = above;
1271 * Loads unique objects from file(s) into the map which is in memory
1272 * m is the map to load unique items into.
1273 */
1274static void
1275load_unique_objects (maptile *m)
1276{
1277 int count;
1278 char firstname[MAX_BUF];
1279
1280 for (count = 0; count < 10; count++)
1281 {
1282 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1283 if (!access (firstname, R_OK))
1284 break;
1285 }
1286 /* If we get here, we did not find any map */
1287 if (count == 10)
1288 return;
1289
1290 object_thawer thawer (firstname);
1291
1292 if (!thawer)
1293 return;
1294
1295 m->in_memory = MAP_LOADING;
1296 if (m->tmpname == NULL) /* if we have loaded unique items from */
1297 delete_unique_items (m); /* original map before, don't duplicate them */
1298
1299 load_objects (m, thawer, 0);
1300
1301 m->in_memory = MAP_IN_MEMORY;
1302}
1303
1304/*
1305 * Saves a map to file. If flag is set, it is saved into the same
1306 * file it was (originally) loaded from. Otherwise a temporary
1307 * filename will be genarated, and the file will be stored there.
1308 * The temporary filename will be stored in the maptileure.
1309 * If the map is unique, we also save to the filename in the map
1310 * (this should have been updated when first loaded)
1311 */
1312int
1313new_save_map (maptile *m, int flag)
1314{
1315 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1316 int i;
1317
1318 if (flag && !*m->path)
1319 {
1320 LOG (llevError, "Tried to save map without path.\n");
1321 return -1;
1322 }
1323
1324 if (flag || (m->unique) || (m->templatemap))
1325 {
1326 if (!m->unique && !m->templatemap)
1327 { /* flag is set */
1328 if (flag == 2)
1329 strcpy (filename, create_overlay_pathname (m->path));
1330 else
1331 strcpy (filename, create_pathname (m->path));
1332 } 905 }
1333 else
1334 strcpy (filename, m->path);
1335
1336 make_path_to_file (filename);
1337 }
1338 else
1339 { 906 }
1340 if (!m->tmpname) 907}
1341 m->tmpname = tempnam (settings.tmpdir, NULL);
1342 908
1343 strcpy (filename, m->tmpname); 909bool
910maptile::save_header (object_freezer &freezer)
911{
912#define MAP_OUT(k) freezer.put (KW_ ## k, k)
913#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
914
915 MAP_OUT2 (arch, "map");
916
917 if (name) MAP_OUT (name);
918 MAP_OUT (swap_time);
919 MAP_OUT (reset_time);
920 MAP_OUT (reset_timeout);
921 MAP_OUT (fixed_resettime);
922 MAP_OUT (difficulty);
923
924 if (region) MAP_OUT2 (region, region->name);
925
926 if (shopitems)
1344 } 927 {
928 char shop[MAX_BUF];
929 print_shop_string (this, shop);
930 MAP_OUT2 (shopitems, shop);
931 }
1345 932
1346 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 933 MAP_OUT (shopgreed);
1347 m->in_memory = MAP_SAVING; 934 MAP_OUT (shopmin);
935 MAP_OUT (shopmax);
936 if (shoprace) MAP_OUT (shoprace);
937 MAP_OUT (darkness);
938 MAP_OUT (width);
939 MAP_OUT (height);
940 MAP_OUT (enter_x);
941 MAP_OUT (enter_y);
1348 942
943 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
944 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
945
946 MAP_OUT (outdoor);
947 MAP_OUT (temp);
948 MAP_OUT (pressure);
949 MAP_OUT (humid);
950 MAP_OUT (windspeed);
951 MAP_OUT (winddir);
952 MAP_OUT (sky);
953
954 MAP_OUT (per_player);
955 MAP_OUT (per_party);
956
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
958 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
959 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
960 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961
962 MAP_OUT2 (end, 0);
963
964 return true;
965}
966
967bool
968maptile::save_header (const char *path)
969{
1349 object_freezer freezer; 970 object_freezer freezer;
1350 971
1351 /* legacy */ 972 if (!save_header (freezer))
1352 fprintf (freezer, "arch map\n"); 973 return false;
1353 if (m->name)
1354 fprintf (freezer, "name %s\n", m->name);
1355 if (!flag)
1356 fprintf (freezer, "swap_time %d\n", m->swap_time);
1357 if (m->reset_timeout)
1358 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1359 if (m->fixed_resettime)
1360 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1361 /* we unfortunately have no idea if this is a value the creator set
1362 * or a difficulty value we generated when the map was first loaded
1363 */
1364 if (m->difficulty)
1365 fprintf (freezer, "difficulty %d\n", m->difficulty);
1366 if (m->region)
1367 fprintf (freezer, "region %s\n", m->region->name);
1368 if (m->shopitems)
1369 {
1370 print_shop_string (m, shop);
1371 fprintf (freezer, "shopitems %s\n", shop);
1372 }
1373 if (m->shopgreed)
1374 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1375 if (m->shopmin)
1376 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1377 if (m->shopmax)
1378 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1379 if (m->shoprace)
1380 fprintf (freezer, "shoprace %s\n", m->shoprace);
1381 if (m->darkness)
1382 fprintf (freezer, "darkness %d\n", m->darkness);
1383 if (m->width)
1384 fprintf (freezer, "width %d\n", m->width);
1385 if (m->height)
1386 fprintf (freezer, "height %d\n", m->height);
1387 if (m->enter_x)
1388 fprintf (freezer, "enter_x %d\n", m->enter_x);
1389 if (m->enter_y)
1390 fprintf (freezer, "enter_y %d\n", m->enter_y);
1391 if (m->msg)
1392 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1393 if (m->maplore)
1394 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1395 if (m->unique)
1396 fprintf (freezer, "unique %d\n", m->unique);
1397 if (m->templatemap)
1398 fprintf (freezer, "template %d\n", m->templatemap);
1399 if (m->outdoor)
1400 fprintf (freezer, "outdoor %d\n", m->outdoor);
1401 if (m->temp)
1402 fprintf (freezer, "temp %d\n", m->temp);
1403 if (m->pressure)
1404 fprintf (freezer, "pressure %d\n", m->pressure);
1405 if (m->humid)
1406 fprintf (freezer, "humid %d\n", m->humid);
1407 if (m->windspeed)
1408 fprintf (freezer, "windspeed %d\n", m->windspeed);
1409 if (m->winddir)
1410 fprintf (freezer, "winddir %d\n", m->winddir);
1411 if (m->sky)
1412 fprintf (freezer, "sky %d\n", m->sky);
1413 if (m->nosmooth)
1414 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1415 974
1416 /* Save any tiling information, except on overlays */ 975 return freezer.save (path);
1417 if (flag != 2)
1418 for (i = 0; i < 4; i++)
1419 if (m->tile_path[i])
1420 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1421
1422 freezer.put (m);
1423 fprintf (freezer, "end\n");
1424
1425 /* In the game save unique items in the different file, but
1426 * in the editor save them to the normal map file.
1427 * If unique map, save files in the proper destination (set by
1428 * player)
1429 */
1430 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1431 {
1432 object_freezer unique;
1433
1434 if (flag == 2)
1435 save_objects (m, freezer, unique, 2);
1436 else
1437 save_objects (m, freezer, unique, 0);
1438
1439 sprintf (buf, "%s.v00", create_items_path (m->path));
1440
1441 unique.save (buf);
1442 }
1443 else
1444 { /* save same file when not playing, like in editor */
1445 save_objects (m, freezer, freezer, 0);
1446 }
1447
1448 freezer.save (filename);
1449
1450 return 0;
1451} 976}
1452 977
1453/* 978/*
1454 * Remove and free all objects in the given map. 979 * Remove and free all objects in the given map.
1455 */ 980 */
1456void 981void
1457free_all_objects (maptile *m) 982maptile::clear ()
1458{ 983{
1459 if (!m->spaces) 984 if (!spaces)
1460 return; 985 return;
1461 986
1462 for (int i = 0; i < m->width; i++) 987 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1463 for (int j = 0; j < m->height; j++) 988 while (object *op = ms->bot)
1464 { 989 {
1465 mapspace &ms = m->at (i, j);
1466
1467 while (object *op = ms.bot)
1468 {
1469 if (op->head) 990 if (op->head)
1470 op = op->head; 991 op = op->head;
1471 992
1472 op->destroy_inv (false); 993 op->destroy_inv (false);
1473 op->destroy (); 994 op->destroy ();
1474 }
1475 } 995 }
1476}
1477 996
1478/* 997 sfree (spaces, size ()), spaces = 0;
1479 * Frees everything allocated by the given maptileure. 998
1480 * don't free tmpname - our caller is left to do that 999 if (buttons)
1481 */ 1000 free_objectlinkpt (buttons), buttons = 0;
1001}
1002
1482void 1003void
1483free_map (maptile *m, int flag) 1004maptile::clear_header ()
1484{ 1005{
1485 if (!m->in_memory) //TODO: makes no sense to me? 1006 name = 0;
1486 return; 1007 msg = 0;
1487 1008 maplore = 0;
1488 m->in_memory = MAP_SAVING; 1009 shoprace = 0;
1489
1490 // TODO: use new/delete
1491
1492 if (flag && m->spaces)
1493 free_all_objects (m);
1494
1495 sfree (m->spaces, m->size ()), m->spaces = 0;
1496
1497 free (m->name), m->name = 0;
1498 free (m->msg), m->msg = 0;
1499 free (m->maplore), m->maplore = 0;
1500 free (m->shoprace), m->shoprace = 0;
1501 delete [] m->shopitems, m->shopitems = 0; 1010 delete [] shopitems, shopitems = 0;
1502
1503 if (m->buttons)
1504 free_objectlinkpt (m->buttons), m->buttons = 0;
1505 1011
1506 for (int i = 0; i < 4; i++) 1012 for (int i = 0; i < 4; i++)
1507 free (m->tile_path[i]), m->tile_path[i] = 0; 1013 tile_path [i] = 0;
1508
1509 m->in_memory = MAP_SWAPPED;
1510} 1014}
1511 1015
1512maptile::~maptile () 1016maptile::~maptile ()
1513{ 1017{
1514 assert (destroyed ()); 1018 assert (destroyed ());
1515} 1019}
1516 1020
1517void 1021void
1518maptile::do_destroy () 1022maptile::clear_links_to (maptile *m)
1519{ 1023{
1520 attachable::do_destroy ();
1521
1522 unlink ();
1523
1524 free_map (this, 1);
1525 free (tmpname), tmpname = 0;
1526
1527 /* We need to look through all the maps and see if any maps 1024 /* We need to look through all the maps and see if any maps
1528 * are pointing at this one for tiling information. Since 1025 * are pointing at this one for tiling information. Since
1529 * tiling can be asymetric, we just can not look to see which 1026 * tiling can be asymetric, we just can not look to see which
1530 * maps this map tiles with and clears those. 1027 * maps this map tiles with and clears those.
1531 */ 1028 */
1532 //TODO: non-euclidean-tiling MUST GO
1533 for_all_maps (m)
1534 for (int i = 0; i < 4; i++) 1029 for (int i = 0; i < 4; i++)
1535 if (m->tile_map[i] == this) 1030 if (tile_map[i] == m)
1536 m->tile_map[i] = 0; 1031 tile_map[i] = 0;
1537} 1032}
1538 1033
1539//TODO: must go
1540void 1034void
1541delete_map (maptile *m) 1035maptile::do_destroy ()
1542{ 1036{
1543 if (m) 1037 attachable::do_destroy ();
1544 m->destroy (); 1038
1039 clear ();
1545} 1040}
1546 1041
1547/* 1042/*
1548 * Makes sure the given map is loaded and swapped in. 1043 * Updates every button on the map (by calling update_button() for them).
1549 * name is path name of the map.
1550 * flags meaning:
1551 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1552 * and don't do unique items or the like.
1553 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1554 * dont do any more name translation on it.
1555 * 1044 */
1556 * Returns a pointer to the given map. 1045void
1557 */ 1046maptile::update_buttons ()
1558maptile *
1559ready_map_name (const char *name, int flags)
1560{ 1047{
1561 if (!name) 1048 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1562 return 0; 1049 for (objectlink *ol = obp->link; ol; ol = ol->next)
1563
1564 /* Have we been at this level before? */
1565 maptile *m = has_been_loaded (name);
1566
1567 /* Map is good to go, so just return it */
1568 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1569 return m;
1570
1571 /* unique maps always get loaded from their original location, and never
1572 * a temp location. Likewise, if map_flush is set, or we have never loaded
1573 * this map, load it now. I removed the reset checking from here -
1574 * it seems the probability of a player trying to enter a map that should
1575 * reset but hasn't yet is quite low, and removing that makes this function
1576 * a bit cleaner (and players probably shouldn't rely on exact timing for
1577 * resets in any case - if they really care, they should use the 'maps command.
1578 */
1579 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1580 { 1050 {
1581 /* first visit or time to reset */ 1051 if (!ol->ob)
1582 if (m)
1583 { 1052 {
1584 clean_tmp_map (m); /* Doesn't make much difference */ 1053 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1585 delete_map (m); 1054 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
1055 continue;
1586 } 1056 }
1587 1057
1588 /* create and load a map */ 1058 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1589 if (flags & MAP_PLAYER_UNIQUE)
1590 LOG (llevDebug, "Trying to load map %s.\n", name);
1591 else
1592 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1593
1594 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1595 return (NULL);
1596
1597 fix_auto_apply (m); /* Chests which open as default */
1598
1599 /* If a player unique map, no extra unique object file to load.
1600 * if from the editor, likewise.
1601 */
1602 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1603 load_unique_objects (m);
1604
1605 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1606 { 1059 {
1607 m = load_overlay_map (name, m); 1060 update_button (ol->ob);
1608 if (m == NULL) 1061 break;
1609 return NULL;
1610 } 1062 }
1611
1612 if (flags & MAP_PLAYER_UNIQUE)
1613 INVOKE_MAP (SWAPIN, m);
1614
1615 } 1063 }
1616 else
1617 {
1618 /* If in this loop, we found a temporary map, so load it up. */
1619
1620 m = load_temporary_map (m);
1621 if (m == NULL)
1622 return NULL;
1623 load_unique_objects (m);
1624
1625 clean_tmp_map (m);
1626 m->in_memory = MAP_IN_MEMORY;
1627 /* tempnam() on sun systems (probably others) uses malloc
1628 * to allocated space for the string. Free it here.
1629 * In some cases, load_temporary_map above won't find the
1630 * temporary map, and so has reloaded a new map. If that
1631 * is the case, tmpname is now null
1632 */
1633 if (m->tmpname)
1634 free (m->tmpname);
1635 m->tmpname = NULL;
1636 /* It's going to be saved anew anyway */
1637 }
1638
1639 /* Below here is stuff common to both first time loaded maps and
1640 * temp maps.
1641 */
1642
1643 decay_objects (m); /* start the decay */
1644 /* In case other objects press some buttons down */
1645 update_buttons (m);
1646 if (m->outdoor)
1647 set_darkness_map (m);
1648 /* run the weather over this map */
1649 weather_effect (name);
1650 return m;
1651} 1064}
1652
1653 1065
1654/* 1066/*
1655 * This routine is supposed to find out the difficulty of the map. 1067 * This routine is supposed to find out the difficulty of the map.
1656 * difficulty does not have a lot to do with character level, 1068 * difficulty does not have a lot to do with character level,
1657 * but does have a lot to do with treasure on the map. 1069 * but does have a lot to do with treasure on the map.
1659 * Difficulty can now be set by the map creature. If the value stored 1071 * Difficulty can now be set by the map creature. If the value stored
1660 * in the map is zero, then use this routine. Maps should really 1072 * in the map is zero, then use this routine. Maps should really
1661 * have a difficulty set than using this function - human calculation 1073 * have a difficulty set than using this function - human calculation
1662 * is much better than this functions guesswork. 1074 * is much better than this functions guesswork.
1663 */ 1075 */
1664
1665int 1076int
1666calculate_difficulty (maptile *m) 1077maptile::estimate_difficulty () const
1667{ 1078{
1668 object *op;
1669 archetype *at;
1670 int x, y, i;
1671 long monster_cnt = 0; 1079 long monster_cnt = 0;
1672 double avgexp = 0; 1080 double avgexp = 0;
1673 sint64 total_exp = 0; 1081 sint64 total_exp = 0;
1674 1082
1675 if (m->difficulty) 1083 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1676 { 1084 for (object *op = ms->bot; op; op = op->above)
1677 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1678 return m->difficulty;
1679 }
1680
1681 for (x = 0; x < m->width; x++)
1682 for (y = 0; y < m->height; y++)
1683 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1684 { 1085 {
1685 if (QUERY_FLAG (op, FLAG_MONSTER)) 1086 if (QUERY_FLAG (op, FLAG_MONSTER))
1686 { 1087 {
1687 total_exp += op->stats.exp; 1088 total_exp += op->stats.exp;
1688 monster_cnt++; 1089 monster_cnt++;
1689 } 1090 }
1690 1091
1691 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1092 if (QUERY_FLAG (op, FLAG_GENERATOR))
1692 { 1093 {
1693 total_exp += op->stats.exp; 1094 total_exp += op->stats.exp;
1095
1694 at = type_to_archetype (GENERATE_TYPE (op)); 1096 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1695
1696 if (at != NULL)
1697 total_exp += at->clone.stats.exp * 8; 1097 total_exp += at->clone.stats.exp * 8;
1698 1098
1699 monster_cnt++; 1099 monster_cnt++;
1700 } 1100 }
1701 } 1101 }
1702 1102
1703 avgexp = (double) total_exp / monster_cnt; 1103 avgexp = (double) total_exp / monster_cnt;
1704 1104
1705 for (i = 1; i <= settings.max_level; i++) 1105 for (int i = 1; i <= settings.max_level; i++)
1706 {
1707 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp)) 1106 if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp))
1708 {
1709 /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1710 return i; 1107 return i;
1711 }
1712 }
1713 1108
1714 return 1; 1109 return 1;
1715}
1716
1717void
1718clean_tmp_map (maptile *m)
1719{
1720 if (m->tmpname == NULL)
1721 return;
1722 INVOKE_MAP (CLEAN, m);
1723 (void) unlink (m->tmpname);
1724}
1725
1726void
1727free_all_maps (void)
1728{
1729 int real_maps = 0;
1730
1731 while (first_map)
1732 {
1733 /* I think some of the callers above before it gets here set this to be
1734 * saving, but we still want to free this data
1735 */
1736 if (first_map->in_memory == MAP_SAVING)
1737 first_map->in_memory = MAP_IN_MEMORY;
1738 delete_map (first_map);
1739 real_maps++;
1740 }
1741
1742 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1743} 1110}
1744 1111
1745/* change_map_light() - used to change map light level (darkness) 1112/* change_map_light() - used to change map light level (darkness)
1746 * up or down. Returns true if successful. It should now be 1113 * up or down. Returns true if successful. It should now be
1747 * possible to change a value by more than 1. 1114 * possible to change a value by more than 1.
1748 * Move this from los.c to map.c since this is more related 1115 * Move this from los.c to map.c since this is more related
1749 * to maps than los. 1116 * to maps than los.
1750 * postive values make it darker, negative make it brighter 1117 * postive values make it darker, negative make it brighter
1751 */ 1118 */
1752
1753int 1119int
1754change_map_light (maptile *m, int change) 1120maptile::change_map_light (int change)
1755{ 1121{
1756 int new_level = m->darkness + change; 1122 int new_level = darkness + change;
1757 1123
1758 /* Nothing to do */ 1124 /* Nothing to do */
1759 if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS)) 1125 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))
1760 {
1761 return 0; 1126 return 0;
1762 }
1763 1127
1764 /* inform all players on the map */ 1128 /* inform all players on the map */
1765 if (change > 0) 1129 if (change > 0)
1766 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); 1130 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1767 else 1131 else
1768 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); 1132 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1769 1133
1770 /* Do extra checking. since m->darkness is a unsigned value, 1134 /* Do extra checking. since darkness is a unsigned value,
1771 * we need to be extra careful about negative values. 1135 * we need to be extra careful about negative values.
1772 * In general, the checks below are only needed if change 1136 * In general, the checks below are only needed if change
1773 * is not +/-1 1137 * is not +/-1
1774 */ 1138 */
1775 if (new_level < 0) 1139 if (new_level < 0)
1776 m->darkness = 0; 1140 darkness = 0;
1777 else if (new_level >= MAX_DARKNESS) 1141 else if (new_level >= MAX_DARKNESS)
1778 m->darkness = MAX_DARKNESS; 1142 darkness = MAX_DARKNESS;
1779 else 1143 else
1780 m->darkness = new_level; 1144 darkness = new_level;
1781 1145
1782 /* All clients need to get re-updated for the change */ 1146 /* All clients need to get re-updated for the change */
1783 update_all_map_los (m); 1147 update_all_map_los (this);
1784 return 1; 1148 return 1;
1785} 1149}
1786 1150
1787/* 1151/*
1788 * This function updates various attributes about a specific space 1152 * This function updates various attributes about a specific space
1979 * the map. It also takes care of linking back the freshly loaded 1343 * the map. It also takes care of linking back the freshly loaded
1980 * maps tile_map values if it tiles back to this one. It returns 1344 * maps tile_map values if it tiles back to this one. It returns
1981 * the value of orig_map->tile_map[tile_num]. It really only does this 1345 * the value of orig_map->tile_map[tile_num]. It really only does this
1982 * so that it is easier for calling functions to verify success. 1346 * so that it is easier for calling functions to verify success.
1983 */ 1347 */
1984
1985static maptile * 1348static maptile *
1986load_and_link_tiled_map (maptile *orig_map, int tile_num) 1349load_and_link_tiled_map (maptile *orig_map, int tile_num)
1987{ 1350{
1351 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]);
1352 mp->load ();
1353
1988 int dest_tile = (tile_num + 2) % 4; 1354 int dest_tile = (tile_num + 2) % 4;
1989 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
1990 1355
1991 orig_map->tile_map[tile_num] = ready_map_name (path, 0); 1356 orig_map->tile_map[tile_num] = mp;
1992 1357
1993 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1358 /* need to do a strcmp here as the orig_map->path is not a shared string */
1994 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && !strcmp (orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path)) 1359 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1995 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1360 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1996 1361
1997 return orig_map->tile_map[tile_num]; 1362 return mp;
1998} 1363}
1999 1364
2000/* this returns TRUE if the coordinates (x,y) are out of 1365/* this returns TRUE if the coordinates (x,y) are out of
2001 * map m. This function also takes into account any 1366 * map m. This function also takes into account any
2002 * tiling considerations, loading adjacant maps as needed. 1367 * tiling considerations, loading adjacant maps as needed.
2003 * This is the function should always be used when it 1368 * This is the function should always be used when it
2004 * necessary to check for valid coordinates. 1369 * necessary to check for valid coordinates.
2005 * This function will recursively call itself for the 1370 * This function will recursively call itself for the
2006 * tiled maps. 1371 * tiled maps.
2007 *
2008 *
2009 */ 1372 */
2010int 1373int
2011out_of_map (maptile *m, int x, int y) 1374out_of_map (maptile *m, int x, int y)
2012{ 1375{
2013 /* If we get passed a null map, this is obviously the 1376 /* If we get passed a null map, this is obviously the
2023 return 1; 1386 return 1;
2024 1387
2025 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1388 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2026 load_and_link_tiled_map (m, 3); 1389 load_and_link_tiled_map (m, 3);
2027 1390
2028 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y)); 1391 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
2029 } 1392 }
2030 1393
2031 if (x >= m->width) 1394 if (x >= m->width)
2032 { 1395 {
2033 if (!m->tile_path[1]) 1396 if (!m->tile_path[1])
2034 return 1; 1397 return 1;
2035 1398
2036 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1399 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2037 load_and_link_tiled_map (m, 1); 1400 load_and_link_tiled_map (m, 1);
2038 1401
2039 return (out_of_map (m->tile_map[1], x - m->width, y)); 1402 return out_of_map (m->tile_map[1], x - m->width, y);
2040 } 1403 }
2041 1404
2042 if (y < 0) 1405 if (y < 0)
2043 { 1406 {
2044 if (!m->tile_path[0]) 1407 if (!m->tile_path[0])
2045 return 1; 1408 return 1;
2046 1409
2047 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1410 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2048 load_and_link_tiled_map (m, 0); 1411 load_and_link_tiled_map (m, 0);
2049 1412
2050 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height)); 1413 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
2051 } 1414 }
2052 1415
2053 if (y >= m->height) 1416 if (y >= m->height)
2054 { 1417 {
2055 if (!m->tile_path[2]) 1418 if (!m->tile_path[2])
2056 return 1; 1419 return 1;
2057 1420
2058 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1421 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2059 load_and_link_tiled_map (m, 2); 1422 load_and_link_tiled_map (m, 2);
2060 1423
2061 return (out_of_map (m->tile_map[2], x, y - m->height)); 1424 return out_of_map (m->tile_map[2], x, y - m->height);
2062 } 1425 }
2063 1426
2064 /* Simple case - coordinates are within this local 1427 /* Simple case - coordinates are within this local
2065 * map. 1428 * map.
2066 */ 1429 */
2074 * updates x and y to be the localized coordinates. 1437 * updates x and y to be the localized coordinates.
2075 * Using this is more efficient of calling out_of_map 1438 * Using this is more efficient of calling out_of_map
2076 * and then figuring out what the real map is 1439 * and then figuring out what the real map is
2077 */ 1440 */
2078maptile * 1441maptile *
2079get_map_from_coord (maptile *m, sint16 * x, sint16 * y) 1442get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
2080{ 1443{
2081
2082 if (*x < 0) 1444 if (*x < 0)
2083 { 1445 {
2084 if (!m->tile_path[3]) 1446 if (!m->tile_path[3])
2085 return 0; 1447 return 0;
1448
2086 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1449 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2087 load_and_link_tiled_map (m, 3); 1450 load_and_link_tiled_map (m, 3);
2088 1451
2089 *x += m->tile_map[3]->width; 1452 *x += m->tile_map[3]->width;
2090 return (get_map_from_coord (m->tile_map[3], x, y)); 1453 return (get_map_from_coord (m->tile_map[3], x, y));
2128 1491
2129 /* Simple case - coordinates are within this local 1492 /* Simple case - coordinates are within this local
2130 * map. 1493 * map.
2131 */ 1494 */
2132 1495
1496 m->last_access = runtime;
2133 return m; 1497 return m;
2134} 1498}
2135 1499
2136/** 1500/**
2137 * Return whether map2 is adjacent to map1. If so, store the distance from 1501 * Return whether map2 is adjacent to map1. If so, store the distance from
2145 1509
2146 if (map1 == map2) 1510 if (map1 == map2)
2147 { 1511 {
2148 *dx = 0; 1512 *dx = 0;
2149 *dy = 0; 1513 *dy = 0;
2150
2151 } 1514 }
2152 else if (map1->tile_map[0] == map2) 1515 else if (map1->tile_map[0] == map2)
2153 { /* up */ 1516 { /* up */
2154 *dx = 0; 1517 *dx = 0;
2155 *dy = -map2->height; 1518 *dy = -map2->height;
2166 } 1529 }
2167 else if (map1->tile_map[3] == map2) 1530 else if (map1->tile_map[3] == map2)
2168 { /* left */ 1531 { /* left */
2169 *dx = -map2->width; 1532 *dx = -map2->width;
2170 *dy = 0; 1533 *dy = 0;
2171
2172 } 1534 }
2173 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1535 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2174 { /* up right */ 1536 { /* up right */
2175 *dx = map1->tile_map[0]->width; 1537 *dx = map1->tile_map[0]->width;
2176 *dy = -map1->tile_map[0]->height; 1538 *dy = -map1->tile_map[0]->height;
2207 } 1569 }
2208 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1570 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2209 { /* left down */ 1571 { /* left down */
2210 *dx = -map1->tile_map[3]->width; 1572 *dx = -map1->tile_map[3]->width;
2211 *dy = map1->tile_map[3]->height; 1573 *dy = map1->tile_map[3]->height;
2212
2213 } 1574 }
2214 else 1575 else
2215 { /* not "adjacent" enough */
2216 return 0; 1576 return 0;
2217 }
2218 1577
2219 return 1; 1578 return 1;
2220} 1579}
2221 1580
2222/* From map.c 1581/* From map.c
2237 * be unexpected 1596 * be unexpected
2238 * 1597 *
2239 * currently, the only flag supported (0x1) is don't translate for 1598 * currently, the only flag supported (0x1) is don't translate for
2240 * closest body part of 'op1' 1599 * closest body part of 'op1'
2241 */ 1600 */
2242
2243void 1601void
2244get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1602get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2245{ 1603{
2246 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1604 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
2247 { 1605 {
2328 } 1686 }
2329} 1687}
2330 1688
2331/* Returns true of op1 and op2 are effectively on the same map 1689/* Returns true of op1 and op2 are effectively on the same map
2332 * (as related to map tiling). Note that this looks for a path from 1690 * (as related to map tiling). Note that this looks for a path from
2333 * op1 to op2, so if the tiled maps are assymetric and op2 has a path 1691 * op1 to op2, so if the tiled maps are asymetric and op2 has a path
2334 * to op1, this will still return false. 1692 * to op1, this will still return false.
2335 * Note we only look one map out to keep the processing simple 1693 * Note we only look one map out to keep the processing simple
2336 * and efficient. This could probably be a macro. 1694 * and efficient. This could probably be a macro.
2337 * MSW 2001-08-05 1695 * MSW 2001-08-05
2338 */ 1696 */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines