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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines