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.51 by root, Mon Dec 25 17:11:16 2006 UTC vs.
Revision 1.56 by root, Sat Dec 30 10:16:10 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 510 /* check for unique items, or unique squares */
617 for (op = m->at (i, j).bot; op; op = op->above) 511 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
618 { 512 {
619 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))
620 unique = 1; 514 unique = 1;
621 515
622 if (op->type == PLAYER) 516 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
623 continue; 517 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
624
625 if (op->head || op->owner)
626 continue;
627
628 if (unique || op->flag [FLAG_UNIQUE])
629 save_object (fp2, op, 1);
630 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
631 save_object (fp, op, 1);
632 } 518 }
633 } 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);
634} 611}
635 612
636maptile::maptile () 613maptile::maptile ()
637{ 614{
638 in_memory = MAP_SWAPPED; 615 in_memory = MAP_SWAPPED;
616
639 /* 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
640 * map archetype. Mimic that behaviour. 618 * map archetype. Mimic that behaviour.
641 */ 619 */
642 this->width = 16; 620 width = 16;
643 this->height = 16; 621 height = 16;
644 this->reset_timeout = 0; 622 reset_timeout = 0;
645 this->timeout = 300; 623 timeout = 300;
646 this->enter_x = 0; 624 enter_x = 0;
647 this->enter_y = 0; 625 enter_y = 0;
648 /*set part to -1 indicating conversion to weather map not yet done */
649 this->worldpartx = -1;
650 this->worldparty = -1;
651} 626}
652 627
653/* 628maptile::maptile (int w, int h)
654 * Allocates, initialises, and returns a pointer to a maptile.
655 * Modified to no longer take a path option which was not being
656 * used anyways. MSW 2001-07-01
657 */
658maptile *
659get_linked_map (void)
660{ 629{
661 maptile *mp, *map = new maptile; 630 in_memory = MAP_SWAPPED;
662 631
663 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;
664 638
665 if (mp == NULL) 639 alloc ();
666 first_map = map;
667 else
668 mp->next = map;
669
670 return map;
671} 640}
672 641
673/* 642/*
674 * Allocates the arrays contained in a maptile. 643 * Allocates the arrays contained in a maptile.
675 * This basically allocates the dynamic array of spaces for the 644 * This basically allocates the dynamic array of spaces for the
676 * map. 645 * map.
677 */ 646 */
678void 647void
679maptile::allocate () 648maptile::alloc ()
680{ 649{
681 in_memory = MAP_IN_MEMORY;
682
683 /* Log this condition and free the storage. We could I suppose
684 * realloc, but if the caller is presuming the data will be intact,
685 * that is their poor assumption.
686 */
687 if (spaces) 650 if (spaces)
688 {
689 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
690 free (spaces);
691 }
692
693 spaces = (mapspace *)
694 calloc (1, width * height * sizeof (mapspace));
695
696 if (!spaces)
697 fatal (OUT_OF_MEMORY);
698}
699
700/* Create and returns a map of the specific size. Used
701 * in random map code and the editor.
702 */
703maptile *
704get_empty_map (int sizex, int sizey)
705{
706 maptile *m = get_linked_map ();
707
708 m->width = sizex;
709 m->height = sizey;
710 m->in_memory = MAP_SWAPPED;
711 m->allocate ();
712
713 return m; 651 return;
652
653 spaces = salloc0<mapspace> (size ());
714} 654}
715 655
716/* 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
717 * 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
718 * at a later date. 658 * at a later date.
719 * Called by parse_map_headers below. 659 * Called by parse_map_headers below.
720 */ 660 */
721
722static shopitems * 661static shopitems *
723parse_shop_string (const char *input_string) 662parse_shop_string (const char *input_string)
724{ 663{
725 char *shop_string, *p, *q, *next_semicolon, *next_colon; 664 char *shop_string, *p, *q, *next_semicolon, *next_colon;
726 shopitems *items = NULL; 665 shopitems *items = NULL;
735 p = strchr (p, ';'); 674 p = strchr (p, ';');
736 number_of_entries++; 675 number_of_entries++;
737 if (p) 676 if (p)
738 p++; 677 p++;
739 } 678 }
679
740 p = shop_string; 680 p = shop_string;
741 strip_endline (p); 681 strip_endline (p);
742 items = new shopitems[number_of_entries + 1]; 682 items = new shopitems[number_of_entries + 1];
743 for (i = 0; i < number_of_entries; i++) 683 for (i = 0; i < number_of_entries; i++)
744 { 684 {
745 if (!p) 685 if (!p)
746 { 686 {
747 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");
748 break; 688 break;
749 } 689 }
690
750 next_semicolon = strchr (p, ';'); 691 next_semicolon = strchr (p, ';');
751 next_colon = strchr (p, ':'); 692 next_colon = strchr (p, ':');
752 /* 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. */
753 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 694 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
754 items[i].strength = atoi (strchr (p, ':') + 1); 695 items[i].strength = atoi (strchr (p, ':') + 1);
781 * 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
782 */ 723 */
783 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);
784 } 725 }
785 } 726 }
727
786 items[i].index = number_of_entries; 728 items[i].index = number_of_entries;
787 if (next_semicolon) 729 if (next_semicolon)
788 p = ++next_semicolon; 730 p = ++next_semicolon;
789 else 731 else
790 p = NULL; 732 p = NULL;
791 } 733 }
734
792 free (shop_string); 735 free (shop_string);
793 return items; 736 return items;
794} 737}
795 738
796/* 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
805 for (i = 0; i < m->shopitems[0].index; i++) 748 for (i = 0; i < m->shopitems[0].index; i++)
806 { 749 {
807 if (m->shopitems[i].typenum) 750 if (m->shopitems[i].typenum)
808 { 751 {
809 if (m->shopitems[i].strength) 752 if (m->shopitems[i].strength)
810 {
811 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);
812 }
813 else 754 else
814 sprintf (tmp, "%s;", m->shopitems[i].name); 755 sprintf (tmp, "%s;", m->shopitems[i].name);
815 } 756 }
816 else 757 else
817 { 758 {
818 if (m->shopitems[i].strength) 759 if (m->shopitems[i].strength)
819 {
820 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 760 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
821 }
822 else 761 else
823 sprintf (tmp, "*"); 762 sprintf (tmp, "*");
824 } 763 }
764
825 strcat (output_string, tmp); 765 strcat (output_string, tmp);
826 } 766 }
827} 767}
828 768
829/* This loads the header information of the map. The header 769/* This loads the header information of the map. The header
834 * 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
835 * sense. 775 * sense.
836 * 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
837 * 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.
838 * MSW 2001-07-01 778 * MSW 2001-07-01
839 * return 0 on success, 1 on failure.
840 */ 779 */
841 780bool
842static int 781maptile::load_header (object_thawer &thawer)
843load_map_header (object_thawer & fp, maptile *m)
844{ 782{
845 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;
846 int msgpos = 0; 784 int msgpos = 0;
847 int maplorepos = 0; 785 int maplorepos = 0;
848 786
849 while (fgets (buf, HUGE_BUF, fp) != NULL) 787 for (;;)
850 { 788 {
851 buf[HUGE_BUF - 1] = 0; 789 keyword kw = thawer.get_kv ();
852 key = buf;
853 790
854 while (isspace (*key)) 791 switch (kw)
855 key++;
856
857 if (*key == 0)
858 continue; /* empty line */
859
860 value = strchr (key, ' ');
861
862 if (!value)
863 { 792 {
864 if ((end = strchr (key, '\n'))) 793 case KW_EOF:
865 *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;
866 } 863 }
867 else
868 {
869 *value = 0;
870 value++;
871 end = strchr (value, '\n');
872
873 while (isspace (*value))
874 {
875 value++;
876
877 if (*value == '\0' || value == end)
878 {
879 /* Nothing but spaces. */
880 value = NULL;
881 break;
882 }
883 }
884 }
885
886 if (!end)
887 {
888 LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf);
889 return 1;
890 }
891
892 /* key is the field name, value is what it should be set
893 * to. We've already done the work to null terminate key,
894 * and strip off any leading spaces for both of these.
895 * We have not touched the newline at the end of the line -
896 * these are needed for some values. the end pointer
897 * points to the first of the newlines.
898 * value could be NULL! It would be easy enough to just point
899 * this to "" to prevent cores, but that would let more errors slide
900 * through.
901 *
902 * First check for entries that do not use the value parameter, then
903 * validate that value is given and check for the remaining entries
904 * that use the parameter.
905 */
906
907 if (!strcmp (key, "msg"))
908 {
909 while (fgets (buf, HUGE_BUF, fp) != NULL)
910 {
911 if (!strcmp (buf, "endmsg\n"))
912 break;
913 else
914 {
915 /* slightly more efficient than strcat */
916 strcpy (msgbuf + msgpos, buf);
917 msgpos += strlen (buf);
918 }
919 }
920 /* There are lots of maps that have empty messages (eg, msg/endmsg
921 * with nothing between). There is no reason in those cases to
922 * keep the empty message. Also, msgbuf contains garbage data
923 * when msgpos is zero, so copying it results in crashes
924 */
925 if (msgpos != 0)
926 m->msg = strdup (msgbuf);
927 }
928 else if (!strcmp (key, "maplore"))
929 {
930 while (fgets (buf, HUGE_BUF, fp) != NULL)
931 {
932 if (!strcmp (buf, "endmaplore\n"))
933 break;
934 else
935 {
936 /* slightly more efficient than strcat */
937 strcpy (maplorebuf + maplorepos, buf);
938 maplorepos += strlen (buf);
939 }
940 }
941 if (maplorepos != 0)
942 m->maplore = strdup (maplorebuf);
943 }
944 else if (!strcmp (key, "end"))
945 {
946 break;
947 }
948 else if (value == NULL)
949 {
950 LOG (llevError, "Got '%s' line without parameter in map header\n", key);
951 }
952 else if (!strcmp (key, "arch"))
953 {
954 /* This is an oddity, but not something we care about much. */
955 if (strcmp (value, "map\n"))
956 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
957 }
958 else if (!strcmp (key, "name"))
959 {
960 *end = 0;
961 m->name = strdup (value);
962 }
963 /* first strcmp value on these are old names supported
964 * for compatibility reasons. The new values (second) are
965 * what really should be used.
966 */
967 else if (!strcmp (key, "oid"))
968 fp.get (m, atoi (value));
969 else if (!strcmp (key, "attach"))
970 m->attach = value;
971 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
972 m->enter_x = atoi (value);
973 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
974 m->enter_y = atoi (value);
975 else if (!strcmp (key, "x") || !strcmp (key, "width"))
976 m->width = atoi (value);
977 else if (!strcmp (key, "y") || !strcmp (key, "height"))
978 m->height = atoi (value);
979 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
980 m->reset_timeout = atoi (value);
981 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
982 m->timeout = atoi (value);
983 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
984 m->difficulty = clamp (atoi (value), 1, settings.max_level);
985 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
986 m->darkness = atoi (value);
987 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
988 m->fixed_resettime = atoi (value);
989 else if (!strcmp (key, "unique"))
990 m->unique = atoi (value);
991 else if (!strcmp (key, "template"))
992 m->templatemap = atoi (value);
993 else if (!strcmp (key, "region"))
994 m->region = get_region_by_name (value);
995 else if (!strcmp (key, "shopitems"))
996 {
997 *end = 0;
998 m->shopitems = parse_shop_string (value);
999 }
1000 else if (!strcmp (key, "shopgreed"))
1001 m->shopgreed = atof (value);
1002 else if (!strcmp (key, "shopmin"))
1003 m->shopmin = atol (value);
1004 else if (!strcmp (key, "shopmax"))
1005 m->shopmax = atol (value);
1006 else if (!strcmp (key, "shoprace"))
1007 {
1008 *end = 0;
1009 m->shoprace = strdup (value);
1010 }
1011 else if (!strcmp (key, "outdoor"))
1012 m->outdoor = atoi (value);
1013 else if (!strcmp (key, "temp"))
1014 m->temp = atoi (value);
1015 else if (!strcmp (key, "pressure"))
1016 m->pressure = atoi (value);
1017 else if (!strcmp (key, "humid"))
1018 m->humid = atoi (value);
1019 else if (!strcmp (key, "windspeed"))
1020 m->windspeed = atoi (value);
1021 else if (!strcmp (key, "winddir"))
1022 m->winddir = atoi (value);
1023 else if (!strcmp (key, "sky"))
1024 m->sky = atoi (value);
1025 else if (!strcmp (key, "nosmooth"))
1026 m->nosmooth = atoi (value);
1027 else if (!strncmp (key, "tile_path_", 10))
1028 {
1029 int tile = atoi (key + 10);
1030
1031 if (tile < 1 || tile > 4)
1032 {
1033 LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path);
1034 }
1035 else
1036 {
1037 char *path;
1038
1039 *end = 0;
1040
1041 if (m->tile_path[tile - 1])
1042 {
1043 LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path);
1044 free (m->tile_path[tile - 1]);
1045 m->tile_path[tile - 1] = NULL;
1046 }
1047
1048 if (check_path (value, 1) != -1)
1049 {
1050 /* The unadorned path works. */
1051 path = value;
1052 }
1053 else
1054 {
1055 /* Try again; it could be a relative exit. */
1056
1057 path = path_combine_and_normalize (m->path, value);
1058
1059 if (check_path (path, 1) == -1)
1060 {
1061 LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value);
1062 path = NULL;
1063 }
1064 }
1065
1066 if (editor)
1067 {
1068 /* Use the value as in the file. */
1069 m->tile_path[tile - 1] = strdup (value);
1070 }
1071 else if (path != NULL)
1072 {
1073 /* Use the normalized value. */
1074 m->tile_path[tile - 1] = strdup (path);
1075 }
1076 } /* end if tile direction (in)valid */
1077 }
1078 else
1079 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1080 }
1081
1082 if (!key || strcmp (key, "end"))
1083 { 864 }
1084 LOG (llevError, "Got premature eof on map header!\n");
1085 return 1;
1086 }
1087 865
1088 return 0; 866 abort ();
1089} 867}
1090 868
1091/* 869bool
1092 * Opens the file "filename" and reads information about the map 870maptile::load_header (const char *path)
1093 * from the given file, and stores it in a newly allocated
1094 * maptile. A pointer to this structure is returned, or NULL on failure.
1095 * flags correspond to those in map.h. Main ones used are
1096 * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and
1097 * MAP_BLOCK, in which case we block on this load. This happens in all
1098 * cases, no matter if this flag is set or not.
1099 * MAP_STYLE: style map - don't add active objects, don't add to server
1100 * managed map list.
1101 */
1102
1103maptile *
1104load_original_map (const char *filename, int flags)
1105{ 871{
1106 maptile *m;
1107 char pathname[MAX_BUF];
1108
1109 if (flags & MAP_PLAYER_UNIQUE)
1110 strcpy (pathname, filename);
1111 else if (flags & MAP_OVERLAY)
1112 strcpy (pathname, create_overlay_pathname (filename));
1113 else
1114 strcpy (pathname, create_pathname (filename));
1115
1116 LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
1117
1118 object_thawer thawer (pathname); 872 object_thawer thawer (path);
1119 873
1120 if (!thawer) 874 if (!thawer)
1121 return 0; 875 return false;
1122 876
1123 m = get_linked_map (); 877 return load_header (thawer);
1124
1125 strcpy (m->path, filename);
1126 if (load_map_header (thawer, m))
1127 {
1128 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1129 delete_map (m);
1130 return 0;
1131 }
1132
1133 m->allocate ();
1134
1135 m->in_memory = MAP_LOADING;
1136 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1137
1138 m->in_memory = MAP_IN_MEMORY;
1139 if (!m->difficulty)
1140 m->difficulty = calculate_difficulty (m);
1141 set_map_reset_time (m);
1142 m->instantiate ();
1143 return (m);
1144}
1145
1146/*
1147 * Loads a map, which has been loaded earlier, from file.
1148 * Return the map object we load into (this can change from the passed
1149 * option if we can't find the original map)
1150 */
1151
1152static maptile *
1153load_temporary_map (maptile *m)
1154{
1155 char buf[MAX_BUF];
1156
1157 if (!m->tmpname)
1158 {
1159 LOG (llevError, "No temporary filename for map %s\n", m->path);
1160 strcpy (buf, m->path);
1161 delete_map (m);
1162 m = load_original_map (buf, 0);
1163 if (m == NULL)
1164 return NULL;
1165 fix_auto_apply (m); /* Chests which open as default */
1166 return m;
1167 }
1168
1169 object_thawer thawer (m->tmpname);
1170
1171 if (!thawer)
1172 {
1173 strcpy (buf, m->path);
1174 delete_map (m);
1175 m = load_original_map (buf, 0);
1176 if (!m)
1177 return NULL;
1178 fix_auto_apply (m); /* Chests which open as default */
1179 return m;
1180 }
1181
1182 if (load_map_header (thawer, m))
1183 {
1184 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1185 delete_map (m);
1186 m = load_original_map (m->path, 0);
1187 return NULL;
1188 }
1189
1190 m->allocate ();
1191
1192 m->in_memory = MAP_LOADING;
1193 load_objects (m, thawer, 0);
1194
1195 m->in_memory = MAP_IN_MEMORY;
1196 INVOKE_MAP (SWAPIN, m);
1197 return m;
1198}
1199
1200/*
1201 * Loads a map, which has been loaded earlier, from file.
1202 * Return the map object we load into (this can change from the passed
1203 * option if we can't find the original map)
1204 */
1205
1206maptile *
1207load_overlay_map (const char *filename, maptile *m)
1208{
1209 char pathname[MAX_BUF];
1210
1211 strcpy (pathname, create_overlay_pathname (filename));
1212
1213 object_thawer thawer (pathname);
1214
1215 if (!thawer)
1216 return m;
1217
1218 if (load_map_header (thawer, m))
1219 {
1220 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1221 delete_map (m);
1222 m = load_original_map (m->path, 0);
1223 return 0;
1224 }
1225 /*m->allocate ();*/
1226
1227 m->in_memory = MAP_LOADING;
1228 load_objects (m, thawer, MAP_OVERLAY);
1229
1230 m->in_memory = MAP_IN_MEMORY;
1231 return m;
1232} 878}
1233 879
1234/****************************************************************************** 880/******************************************************************************
1235 * This is the start of unique map handling code 881 * This is the start of unique map handling code
1236 *****************************************************************************/ 882 *****************************************************************************/
1237 883
1238/* 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. */
1239static void 885void
1240delete_unique_items (maptile *m) 886maptile::clear_unique_items ()
1241{ 887{
1242 int i, j, unique; 888 for (int i = 0; i < size (); ++i)
1243 object *op, *next;
1244
1245 for (i = 0; i < m->width; i++)
1246 for (j = 0; j < m->height; j++)
1247 { 889 {
1248 unique = 0; 890 int unique = 0;
1249 891 for (object *op = spaces [i].bot; op; )
1250 for (op = GET_MAP_OB (m, i, j); op; op = next)
1251 { 892 {
1252 next = op->above; 893 object *above = op->above;
1253 894
1254 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))
1255 unique = 1; 896 unique = 1;
1256 897
1257 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 898 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1258 { 899 {
1259 op->destroy_inv (false); 900 op->destroy_inv (false);
1260 op->destroy (); 901 op->destroy ();
1261 } 902 }
1262 }
1263 }
1264}
1265 903
1266 904 op = above;
1267/*
1268 * Loads unique objects from file(s) into the map which is in memory
1269 * m is the map to load unique items into.
1270 */
1271static void
1272load_unique_objects (maptile *m)
1273{
1274 int count;
1275 char firstname[MAX_BUF];
1276
1277 for (count = 0; count < 10; count++)
1278 {
1279 sprintf (firstname, "%s.v%02d", create_items_path (m->path), count);
1280 if (!access (firstname, R_OK))
1281 break;
1282 }
1283 /* If we get here, we did not find any map */
1284 if (count == 10)
1285 return;
1286
1287 object_thawer thawer (firstname);
1288
1289 if (!thawer)
1290 return;
1291
1292 m->in_memory = MAP_LOADING;
1293 if (m->tmpname == NULL) /* if we have loaded unique items from */
1294 delete_unique_items (m); /* original map before, don't duplicate them */
1295
1296 load_objects (m, thawer, 0);
1297
1298 m->in_memory = MAP_IN_MEMORY;
1299}
1300
1301/*
1302 * Saves a map to file. If flag is set, it is saved into the same
1303 * file it was (originally) loaded from. Otherwise a temporary
1304 * filename will be genarated, and the file will be stored there.
1305 * The temporary filename will be stored in the maptileure.
1306 * If the map is unique, we also save to the filename in the map
1307 * (this should have been updated when first loaded)
1308 */
1309int
1310new_save_map (maptile *m, int flag)
1311{
1312 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1313 int i;
1314
1315 if (flag && !*m->path)
1316 {
1317 LOG (llevError, "Tried to save map without path.\n");
1318 return -1;
1319 }
1320
1321 if (flag || (m->unique) || (m->templatemap))
1322 {
1323 if (!m->unique && !m->templatemap)
1324 { /* flag is set */
1325 if (flag == 2)
1326 strcpy (filename, create_overlay_pathname (m->path));
1327 else
1328 strcpy (filename, create_pathname (m->path));
1329 } 905 }
1330 else
1331 strcpy (filename, m->path);
1332
1333 make_path_to_file (filename);
1334 }
1335 else
1336 { 906 }
1337 if (!m->tmpname) 907}
1338 m->tmpname = tempnam (settings.tmpdir, NULL);
1339 908
1340 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)
1341 } 927 {
928 char shop[MAX_BUF];
929 print_shop_string (this, shop);
930 MAP_OUT2 (shopitems, shop);
931 }
1342 932
1343 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 933 MAP_OUT (shopgreed);
1344 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);
1345 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{
1346 object_freezer freezer; 970 object_freezer freezer;
1347 971
1348 /* legacy */ 972 if (!save_header (freezer))
1349 fprintf (freezer, "arch map\n"); 973 return false;
1350 if (m->name)
1351 fprintf (freezer, "name %s\n", m->name);
1352 if (!flag)
1353 fprintf (freezer, "swap_time %d\n", m->swap_time);
1354 if (m->reset_timeout)
1355 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1356 if (m->fixed_resettime)
1357 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1358 /* we unfortunately have no idea if this is a value the creator set
1359 * or a difficulty value we generated when the map was first loaded
1360 */
1361 if (m->difficulty)
1362 fprintf (freezer, "difficulty %d\n", m->difficulty);
1363 if (m->region)
1364 fprintf (freezer, "region %s\n", m->region->name);
1365 if (m->shopitems)
1366 {
1367 print_shop_string (m, shop);
1368 fprintf (freezer, "shopitems %s\n", shop);
1369 }
1370 if (m->shopgreed)
1371 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1372 if (m->shopmin)
1373 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1374 if (m->shopmax)
1375 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1376 if (m->shoprace)
1377 fprintf (freezer, "shoprace %s\n", m->shoprace);
1378 if (m->darkness)
1379 fprintf (freezer, "darkness %d\n", m->darkness);
1380 if (m->width)
1381 fprintf (freezer, "width %d\n", m->width);
1382 if (m->height)
1383 fprintf (freezer, "height %d\n", m->height);
1384 if (m->enter_x)
1385 fprintf (freezer, "enter_x %d\n", m->enter_x);
1386 if (m->enter_y)
1387 fprintf (freezer, "enter_y %d\n", m->enter_y);
1388 if (m->msg)
1389 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1390 if (m->maplore)
1391 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1392 if (m->unique)
1393 fprintf (freezer, "unique %d\n", m->unique);
1394 if (m->templatemap)
1395 fprintf (freezer, "template %d\n", m->templatemap);
1396 if (m->outdoor)
1397 fprintf (freezer, "outdoor %d\n", m->outdoor);
1398 if (m->temp)
1399 fprintf (freezer, "temp %d\n", m->temp);
1400 if (m->pressure)
1401 fprintf (freezer, "pressure %d\n", m->pressure);
1402 if (m->humid)
1403 fprintf (freezer, "humid %d\n", m->humid);
1404 if (m->windspeed)
1405 fprintf (freezer, "windspeed %d\n", m->windspeed);
1406 if (m->winddir)
1407 fprintf (freezer, "winddir %d\n", m->winddir);
1408 if (m->sky)
1409 fprintf (freezer, "sky %d\n", m->sky);
1410 if (m->nosmooth)
1411 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1412 974
1413 /* Save any tiling information, except on overlays */ 975 return freezer.save (path);
1414 if (flag != 2)
1415 for (i = 0; i < 4; i++)
1416 if (m->tile_path[i])
1417 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1418
1419 freezer.put (m);
1420 fprintf (freezer, "end\n");
1421
1422 /* In the game save unique items in the different file, but
1423 * in the editor save them to the normal map file.
1424 * If unique map, save files in the proper destination (set by
1425 * player)
1426 */
1427 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1428 {
1429 object_freezer unique;
1430
1431 if (flag == 2)
1432 save_objects (m, freezer, unique, 2);
1433 else
1434 save_objects (m, freezer, unique, 0);
1435
1436 sprintf (buf, "%s.v00", create_items_path (m->path));
1437
1438 unique.save (buf);
1439 }
1440 else
1441 { /* save same file when not playing, like in editor */
1442 save_objects (m, freezer, freezer, 0);
1443 }
1444
1445 freezer.save (filename);
1446
1447 return 0;
1448} 976}
1449 977
1450/* 978/*
1451 * Remove and free all objects in the given map. 979 * Remove and free all objects in the given map.
1452 */ 980 */
1453void 981void
1454free_all_objects (maptile *m) 982maptile::clear ()
1455{ 983{
1456 if (!m->spaces) 984 if (!spaces)
1457 return; 985 return;
1458 986
1459 for (int i = 0; i < m->width; i++) 987 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1460 for (int j = 0; j < m->height; j++) 988 while (object *op = ms->bot)
1461 { 989 {
1462 mapspace &ms = m->at (i, j);
1463
1464 while (object *op = ms.bot)
1465 {
1466 if (op->head) 990 if (op->head)
1467 op = op->head; 991 op = op->head;
1468 992
1469 op->destroy_inv (false); 993 op->destroy_inv (false);
1470 op->destroy (); 994 op->destroy ();
1471 }
1472 } 995 }
1473}
1474 996
1475/* 997 sfree (spaces, size ()), spaces = 0;
1476 * Frees everything allocated by the given maptileure. 998
1477 * don't free tmpname - our caller is left to do that 999 if (buttons)
1478 */ 1000 free_objectlinkpt (buttons), buttons = 0;
1001}
1002
1479void 1003void
1480free_map (maptile *m, int flag) 1004maptile::clear_header ()
1481{ 1005{
1482 if (!m->in_memory) //TODO: makes no sense to me? 1006 name = 0;
1483 return; 1007 msg = 0;
1484 1008 maplore = 0;
1485 m->in_memory = MAP_SAVING; 1009 shoprace = 0;
1486
1487 // TODO: use new/delete
1488
1489 if (flag && m->spaces)
1490 free_all_objects (m);
1491
1492 free (m->name), m->name = 0;
1493 free (m->spaces), m->spaces = 0;
1494 free (m->msg), m->msg = 0;
1495 free (m->maplore), m->maplore = 0;
1496 free (m->shoprace), m->shoprace = 0;
1497 delete [] m->shopitems, m->shopitems = 0; 1010 delete [] shopitems, shopitems = 0;
1498
1499 if (m->buttons)
1500 free_objectlinkpt (m->buttons), m->buttons = 0;
1501 1011
1502 for (int i = 0; i < 4; i++) 1012 for (int i = 0; i < 4; i++)
1503 {
1504 if (m->tile_path[i])
1505 free (m->tile_path[i]), m->tile_path[i] = 0;
1506
1507 m->tile_map[i] = 0; 1013 tile_path [i] = 0;
1508 }
1509
1510 m->in_memory = MAP_SWAPPED;
1511} 1014}
1512 1015
1513maptile::~maptile () 1016maptile::~maptile ()
1514{ 1017{
1515 free_map (this, 1); 1018 assert (destroyed ());
1516 free (tmpname);
1517} 1019}
1518 1020
1519void 1021void
1520maptile::do_destroy () 1022maptile::clear_links_to (maptile *m)
1521{ 1023{
1522 attachable::do_destroy ();
1523
1524 free_all_objects (this);
1525
1526 /* 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
1527 * are pointing at this one for tiling information. Since 1025 * are pointing at this one for tiling information. Since
1528 * 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
1529 * maps this map tiles with and clears those. 1027 * maps this map tiles with and clears those.
1530 */ 1028 */
1531 //TODO: non-euclidean-tiling MUST GO
1532 for (maptile *m = first_map; m; m = m->next)
1533 for (int i = 0; i < 4; i++) 1029 for (int i = 0; i < 4; i++)
1534 if (m->tile_map[i] == this) 1030 if (tile_map[i] == m)
1535 m->tile_map[i] = 0; 1031 tile_map[i] = 0;
1536
1537 if (first_map == this)
1538 first_map = next;
1539 else
1540 for (maptile *m = first_map; m; m = m->next)
1541 if (m->next = this)
1542 {
1543 m->next = next;
1544 break;
1545 }
1546} 1032}
1547 1033
1548//TODO: must go
1549void 1034void
1550delete_map (maptile *m) 1035maptile::do_destroy ()
1551{ 1036{
1552 if (m) 1037 attachable::do_destroy ();
1553 m->destroy (); 1038
1039 clear ();
1554} 1040}
1555 1041
1556/* 1042/*
1557 * Makes sure the given map is loaded and swapped in. 1043 * Updates every button on the map (by calling update_button() for them).
1558 * name is path name of the map.
1559 * flags meaning:
1560 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
1561 * and don't do unique items or the like.
1562 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1563 * dont do any more name translation on it.
1564 * 1044 */
1565 * Returns a pointer to the given map. 1045void
1566 */ 1046maptile::update_buttons ()
1567maptile *
1568ready_map_name (const char *name, int flags)
1569{ 1047{
1570 if (!name) 1048 for (oblinkpt *obp = buttons; obp; obp = obp->next)
1571 return 0; 1049 for (objectlink *ol = obp->link; ol; ol = ol->next)
1572
1573 /* Have we been at this level before? */
1574 maptile *m = has_been_loaded (name);
1575
1576 /* Map is good to go, so just return it */
1577 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1578 return m;
1579
1580 /* unique maps always get loaded from their original location, and never
1581 * a temp location. Likewise, if map_flush is set, or we have never loaded
1582 * this map, load it now. I removed the reset checking from here -
1583 * it seems the probability of a player trying to enter a map that should
1584 * reset but hasn't yet is quite low, and removing that makes this function
1585 * a bit cleaner (and players probably shouldn't rely on exact timing for
1586 * resets in any case - if they really care, they should use the 'maps command.
1587 */
1588 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1589 { 1050 {
1590 /* first visit or time to reset */ 1051 if (!ol->ob)
1591 if (m)
1592 { 1052 {
1593 clean_tmp_map (m); /* Doesn't make much difference */ 1053 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
1594 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;
1595 } 1056 }
1596 1057
1597 /* create and load a map */ 1058 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
1598 if (flags & MAP_PLAYER_UNIQUE)
1599 LOG (llevDebug, "Trying to load map %s.\n", name);
1600 else
1601 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1602
1603 //eval_pv ("$x = Event::time", 1);//D
1604 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1605 return (NULL);
1606 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1607
1608 fix_auto_apply (m); /* Chests which open as default */
1609
1610 /* If a player unique map, no extra unique object file to load.
1611 * if from the editor, likewise.
1612 */
1613 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)))
1614 load_unique_objects (m);
1615
1616 if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY)))
1617 { 1059 {
1618 m = load_overlay_map (name, m); 1060 update_button (ol->ob);
1619 if (m == NULL) 1061 break;
1620 return NULL;
1621 } 1062 }
1622
1623 if (flags & MAP_PLAYER_UNIQUE)
1624 INVOKE_MAP (SWAPIN, m);
1625
1626 } 1063 }
1627 else
1628 {
1629 /* If in this loop, we found a temporary map, so load it up. */
1630
1631 m = load_temporary_map (m);
1632 if (m == NULL)
1633 return NULL;
1634 load_unique_objects (m);
1635
1636 clean_tmp_map (m);
1637 m->in_memory = MAP_IN_MEMORY;
1638 /* tempnam() on sun systems (probably others) uses malloc
1639 * to allocated space for the string. Free it here.
1640 * In some cases, load_temporary_map above won't find the
1641 * temporary map, and so has reloaded a new map. If that
1642 * is the case, tmpname is now null
1643 */
1644 if (m->tmpname)
1645 free (m->tmpname);
1646 m->tmpname = NULL;
1647 /* It's going to be saved anew anyway */
1648 }
1649
1650 /* Below here is stuff common to both first time loaded maps and
1651 * temp maps.
1652 */
1653
1654 decay_objects (m); /* start the decay */
1655 /* In case other objects press some buttons down */
1656 update_buttons (m);
1657 if (m->outdoor)
1658 set_darkness_map (m);
1659 /* run the weather over this map */
1660 weather_effect (name);
1661 return m;
1662} 1064}
1663
1664 1065
1665/* 1066/*
1666 * 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.
1667 * difficulty does not have a lot to do with character level, 1068 * difficulty does not have a lot to do with character level,
1668 * 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.
1670 * 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
1671 * 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
1672 * have a difficulty set than using this function - human calculation 1073 * have a difficulty set than using this function - human calculation
1673 * is much better than this functions guesswork. 1074 * is much better than this functions guesswork.
1674 */ 1075 */
1675
1676int 1076int
1677calculate_difficulty (maptile *m) 1077maptile::estimate_difficulty () const
1678{ 1078{
1679 object *op;
1680 archetype *at;
1681 int x, y, i;
1682 long monster_cnt = 0; 1079 long monster_cnt = 0;
1683 double avgexp = 0; 1080 double avgexp = 0;
1684 sint64 total_exp = 0; 1081 sint64 total_exp = 0;
1685 1082
1686 if (m->difficulty) 1083 for (mapspace *ms = spaces + size (); ms-- > spaces; )
1687 { 1084 for (object *op = ms->bot; op; op = op->above)
1688 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1689 return m->difficulty;
1690 }
1691
1692 for (x = 0; x < m->width; x++)
1693 for (y = 0; y < m->height; y++)
1694 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1695 { 1085 {
1696 if (QUERY_FLAG (op, FLAG_MONSTER)) 1086 if (QUERY_FLAG (op, FLAG_MONSTER))
1697 { 1087 {
1698 total_exp += op->stats.exp; 1088 total_exp += op->stats.exp;
1699 monster_cnt++; 1089 monster_cnt++;
1700 } 1090 }
1701 1091
1702 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1092 if (QUERY_FLAG (op, FLAG_GENERATOR))
1703 { 1093 {
1704 total_exp += op->stats.exp; 1094 total_exp += op->stats.exp;
1095
1705 at = type_to_archetype (GENERATE_TYPE (op)); 1096 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1706
1707 if (at != NULL)
1708 total_exp += at->clone.stats.exp * 8; 1097 total_exp += at->clone.stats.exp * 8;
1709 1098
1710 monster_cnt++; 1099 monster_cnt++;
1711 } 1100 }
1712 } 1101 }
1713 1102
1714 avgexp = (double) total_exp / monster_cnt; 1103 avgexp = (double) total_exp / monster_cnt;
1715 1104
1716 for (i = 1; i <= settings.max_level; i++) 1105 for (int i = 1; i <= settings.max_level; i++)
1717 {
1718 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))
1719 {
1720 /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */
1721 return i; 1107 return i;
1722 }
1723 }
1724 1108
1725 return 1; 1109 return 1;
1726}
1727
1728void
1729clean_tmp_map (maptile *m)
1730{
1731 if (m->tmpname == NULL)
1732 return;
1733 INVOKE_MAP (CLEAN, m);
1734 (void) unlink (m->tmpname);
1735}
1736
1737void
1738free_all_maps (void)
1739{
1740 int real_maps = 0;
1741
1742 while (first_map)
1743 {
1744 /* I think some of the callers above before it gets here set this to be
1745 * saving, but we still want to free this data
1746 */
1747 if (first_map->in_memory == MAP_SAVING)
1748 first_map->in_memory = MAP_IN_MEMORY;
1749 delete_map (first_map);
1750 real_maps++;
1751 }
1752 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1753} 1110}
1754 1111
1755/* change_map_light() - used to change map light level (darkness) 1112/* change_map_light() - used to change map light level (darkness)
1756 * up or down. Returns true if successful. It should now be 1113 * up or down. Returns true if successful. It should now be
1757 * possible to change a value by more than 1. 1114 * possible to change a value by more than 1.
1758 * 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
1759 * to maps than los. 1116 * to maps than los.
1760 * postive values make it darker, negative make it brighter 1117 * postive values make it darker, negative make it brighter
1761 */ 1118 */
1762
1763int 1119int
1764change_map_light (maptile *m, int change) 1120maptile::change_map_light (int change)
1765{ 1121{
1766 int new_level = m->darkness + change; 1122 int new_level = darkness + change;
1767 1123
1768 /* Nothing to do */ 1124 /* Nothing to do */
1769 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))
1770 {
1771 return 0; 1126 return 0;
1772 }
1773 1127
1774 /* inform all players on the map */ 1128 /* inform all players on the map */
1775 if (change > 0) 1129 if (change > 0)
1776 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); 1130 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1777 else 1131 else
1778 new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); 1132 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1779 1133
1780 /* Do extra checking. since m->darkness is a unsigned value, 1134 /* Do extra checking. since darkness is a unsigned value,
1781 * we need to be extra careful about negative values. 1135 * we need to be extra careful about negative values.
1782 * In general, the checks below are only needed if change 1136 * In general, the checks below are only needed if change
1783 * is not +/-1 1137 * is not +/-1
1784 */ 1138 */
1785 if (new_level < 0) 1139 if (new_level < 0)
1786 m->darkness = 0; 1140 darkness = 0;
1787 else if (new_level >= MAX_DARKNESS) 1141 else if (new_level >= MAX_DARKNESS)
1788 m->darkness = MAX_DARKNESS; 1142 darkness = MAX_DARKNESS;
1789 else 1143 else
1790 m->darkness = new_level; 1144 darkness = new_level;
1791 1145
1792 /* All clients need to get re-updated for the change */ 1146 /* All clients need to get re-updated for the change */
1793 update_all_map_los (m); 1147 update_all_map_los (this);
1794 return 1; 1148 return 1;
1795} 1149}
1796 1150
1797/* 1151/*
1798 * This function updates various attributes about a specific space 1152 * This function updates various attributes about a specific space
1973} 1327}
1974 1328
1975void 1329void
1976set_map_reset_time (maptile *map) 1330set_map_reset_time (maptile *map)
1977{ 1331{
1978 int timeout;
1979
1980 timeout = map->reset_timeout; 1332 int timeout = map->reset_timeout;
1333
1981 if (timeout <= 0) 1334 if (timeout <= 0)
1982 timeout = MAP_DEFAULTRESET; 1335 timeout = MAP_DEFAULTRESET;
1983 if (timeout >= MAP_MAXRESET) 1336 if (timeout >= MAP_MAXRESET)
1984 timeout = MAP_MAXRESET; 1337 timeout = MAP_MAXRESET;
1338
1985 map->reset_time = time (0) + timeout; 1339 map->reset_time = time (0) + timeout;
1986} 1340}
1987 1341
1988/* this updates the orig_map->tile_map[tile_num] value after loading 1342/* this updates the orig_map->tile_map[tile_num] value after loading
1989 * 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
1990 * 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
1991 * 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
1992 * so that it is easier for calling functions to verify success. 1346 * so that it is easier for calling functions to verify success.
1993 */ 1347 */
1994
1995static maptile * 1348static maptile *
1996load_and_link_tiled_map (maptile *orig_map, int tile_num) 1349load_and_link_tiled_map (maptile *orig_map, int tile_num)
1997{ 1350{
1351 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]);
1352 mp->load ();
1353
1998 int dest_tile = (tile_num + 2) % 4; 1354 int dest_tile = (tile_num + 2) % 4;
1999 char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]);
2000 1355
2001 orig_map->tile_map[tile_num] = ready_map_name (path, 0); 1356 orig_map->tile_map[tile_num] = mp;
2002 1357
2003 /* 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 */
2004 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)
2005 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;
2006 1361
2007 return orig_map->tile_map[tile_num]; 1362 return mp;
2008} 1363}
2009 1364
2010/* this returns TRUE if the coordinates (x,y) are out of 1365/* this returns TRUE if the coordinates (x,y) are out of
2011 * map m. This function also takes into account any 1366 * map m. This function also takes into account any
2012 * tiling considerations, loading adjacant maps as needed. 1367 * tiling considerations, loading adjacant maps as needed.
2013 * This is the function should always be used when it 1368 * This is the function should always be used when it
2014 * necessary to check for valid coordinates. 1369 * necessary to check for valid coordinates.
2015 * This function will recursively call itself for the 1370 * This function will recursively call itself for the
2016 * tiled maps. 1371 * tiled maps.
2017 *
2018 *
2019 */ 1372 */
2020int 1373int
2021out_of_map (maptile *m, int x, int y) 1374out_of_map (maptile *m, int x, int y)
2022{ 1375{
2023 /* If we get passed a null map, this is obviously the 1376 /* If we get passed a null map, this is obviously the
2033 return 1; 1386 return 1;
2034 1387
2035 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)
2036 load_and_link_tiled_map (m, 3); 1389 load_and_link_tiled_map (m, 3);
2037 1390
2038 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);
2039 } 1392 }
2040 1393
2041 if (x >= m->width) 1394 if (x >= m->width)
2042 { 1395 {
2043 if (!m->tile_path[1]) 1396 if (!m->tile_path[1])
2044 return 1; 1397 return 1;
2045 1398
2046 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)
2047 load_and_link_tiled_map (m, 1); 1400 load_and_link_tiled_map (m, 1);
2048 1401
2049 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);
2050 } 1403 }
2051 1404
2052 if (y < 0) 1405 if (y < 0)
2053 { 1406 {
2054 if (!m->tile_path[0]) 1407 if (!m->tile_path[0])
2055 return 1; 1408 return 1;
2056 1409
2057 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)
2058 load_and_link_tiled_map (m, 0); 1411 load_and_link_tiled_map (m, 0);
2059 1412
2060 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);
2061 } 1414 }
2062 1415
2063 if (y >= m->height) 1416 if (y >= m->height)
2064 { 1417 {
2065 if (!m->tile_path[2]) 1418 if (!m->tile_path[2])
2066 return 1; 1419 return 1;
2067 1420
2068 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)
2069 load_and_link_tiled_map (m, 2); 1422 load_and_link_tiled_map (m, 2);
2070 1423
2071 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);
2072 } 1425 }
2073 1426
2074 /* Simple case - coordinates are within this local 1427 /* Simple case - coordinates are within this local
2075 * map. 1428 * map.
2076 */ 1429 */
2084 * updates x and y to be the localized coordinates. 1437 * updates x and y to be the localized coordinates.
2085 * Using this is more efficient of calling out_of_map 1438 * Using this is more efficient of calling out_of_map
2086 * and then figuring out what the real map is 1439 * and then figuring out what the real map is
2087 */ 1440 */
2088maptile * 1441maptile *
2089get_map_from_coord (maptile *m, sint16 * x, sint16 * y) 1442get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
2090{ 1443{
2091
2092 if (*x < 0) 1444 if (*x < 0)
2093 { 1445 {
2094 if (!m->tile_path[3]) 1446 if (!m->tile_path[3])
2095 return 0; 1447 return 0;
1448
2096 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)
2097 load_and_link_tiled_map (m, 3); 1450 load_and_link_tiled_map (m, 3);
2098 1451
2099 *x += m->tile_map[3]->width; 1452 *x += m->tile_map[3]->width;
2100 return (get_map_from_coord (m->tile_map[3], x, y)); 1453 return (get_map_from_coord (m->tile_map[3], x, y));
2138 1491
2139 /* Simple case - coordinates are within this local 1492 /* Simple case - coordinates are within this local
2140 * map. 1493 * map.
2141 */ 1494 */
2142 1495
1496 m->last_access = runtime;
2143 return m; 1497 return m;
2144} 1498}
2145 1499
2146/** 1500/**
2147 * 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
2155 1509
2156 if (map1 == map2) 1510 if (map1 == map2)
2157 { 1511 {
2158 *dx = 0; 1512 *dx = 0;
2159 *dy = 0; 1513 *dy = 0;
2160
2161 } 1514 }
2162 else if (map1->tile_map[0] == map2) 1515 else if (map1->tile_map[0] == map2)
2163 { /* up */ 1516 { /* up */
2164 *dx = 0; 1517 *dx = 0;
2165 *dy = -map2->height; 1518 *dy = -map2->height;
2176 } 1529 }
2177 else if (map1->tile_map[3] == map2) 1530 else if (map1->tile_map[3] == map2)
2178 { /* left */ 1531 { /* left */
2179 *dx = -map2->width; 1532 *dx = -map2->width;
2180 *dy = 0; 1533 *dy = 0;
2181
2182 } 1534 }
2183 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)
2184 { /* up right */ 1536 { /* up right */
2185 *dx = map1->tile_map[0]->width; 1537 *dx = map1->tile_map[0]->width;
2186 *dy = -map1->tile_map[0]->height; 1538 *dy = -map1->tile_map[0]->height;
2217 } 1569 }
2218 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)
2219 { /* left down */ 1571 { /* left down */
2220 *dx = -map1->tile_map[3]->width; 1572 *dx = -map1->tile_map[3]->width;
2221 *dy = map1->tile_map[3]->height; 1573 *dy = map1->tile_map[3]->height;
2222
2223 } 1574 }
2224 else 1575 else
2225 { /* not "adjacent" enough */
2226 return 0; 1576 return 0;
2227 }
2228 1577
2229 return 1; 1578 return 1;
2230} 1579}
2231 1580
2232/* From map.c 1581/* From map.c
2247 * be unexpected 1596 * be unexpected
2248 * 1597 *
2249 * currently, the only flag supported (0x1) is don't translate for 1598 * currently, the only flag supported (0x1) is don't translate for
2250 * closest body part of 'op1' 1599 * closest body part of 'op1'
2251 */ 1600 */
2252
2253void 1601void
2254get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1602get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
2255{ 1603{
2256 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))
2257 { 1605 {
2338 } 1686 }
2339} 1687}
2340 1688
2341/* 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
2342 * (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
2343 * 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
2344 * to op1, this will still return false. 1692 * to op1, this will still return false.
2345 * 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
2346 * and efficient. This could probably be a macro. 1694 * and efficient. This could probably be a macro.
2347 * MSW 2001-08-05 1695 * MSW 2001-08-05
2348 */ 1696 */
2351{ 1699{
2352 int dx, dy; 1700 int dx, dy;
2353 1701
2354 return adjacent_map (op1->map, op2->map, &dx, &dy); 1702 return adjacent_map (op1->map, op2->map, &dx, &dy);
2355} 1703}
1704
1705object *
1706maptile::insert (object *op, int x, int y, object *originator, int flags)
1707{
1708 if (!op->flag [FLAG_REMOVED])
1709 op->remove ();
1710
1711 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1712}
1713

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines