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.50 by root, Mon Dec 25 15:28:35 2006 UTC vs.
Revision 1.58 by root, Sat Dec 30 18:45:27 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines