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.38 by pippijn, Mon Dec 11 19:46:46 2006 UTC vs.
Revision 1.55 by root, Wed Dec 27 18:09:48 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 31
34/* 32/*
35 * Returns the maptile which has a name matching the given argument. 33 * Returns the maptile which has a name matching the given argument.
36 * return NULL if no match is found. 34 * return NULL if no match is found.
37 */ 35 */
38
39maptile * 36maptile *
40has_been_loaded (const char *name) 37has_been_loaded (const char *name)
41{ 38{
42 maptile *map;
43
44 if (!name || !*name) 39 if (!name || !*name)
45 return 0; 40 return 0;
46 for (map = first_map; map; map = map->next) 41
42 for_all_maps (map)
47 if (!strcmp (name, map->path)) 43 if (!strcmp (name, map->path))
48 break;
49 return (map); 44 return map;
45
46 return 0;
50} 47}
51 48
52/* 49/*
53 * This makes a path absolute outside the world of Crossfire. 50 * This makes a path absolute outside the world of Crossfire.
54 * In other words, it prepends LIBDIR/MAPDIR/ to the given path 51 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
… …
197 194
198void 195void
199dump_map (const maptile *m) 196dump_map (const maptile *m)
200{ 197{
201 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); 198 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
202 LOG (llevError, "Size: %dx%d Start: %d,%d\n", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m)); 199 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y);
203 200
204 if (m->msg != NULL) 201 if (m->msg != NULL)
205 LOG (llevError, "Message:\n%s", m->msg); 202 LOG (llevError, "Message:\n%s", m->msg);
206 203
207 if (m->maplore != NULL) 204 if (m->maplore != NULL)
… …
221 */ 218 */
222 219
223void 220void
224dump_all_maps (void) 221dump_all_maps (void)
225{ 222{
226 maptile *m; 223 for_all_maps (m)
227
228 for (m = first_map; m != NULL; m = m->next)
229 {
230 dump_map (m); 224 dump_map (m);
231 }
232} 225}
233 226
234/* This rolls up wall, blocks_magic, blocks_view, etc, all into 227/* This rolls up wall, blocks_magic, blocks_view, etc, all into
235 * one function that just returns a P_.. value (see map.h) 228 * one function that just returns a P_.. value (see map.h)
236 * it will also do map translation for tiled maps, returning 229 * it will also do map translation for tiled maps, returning
… …
240 * is needed. The case of not passing values is if we're just 233 * is needed. The case of not passing values is if we're just
241 * checking for the existence of something on those spaces, but 234 * checking for the existence of something on those spaces, but
242 * don't expect to insert/remove anything from those spaces. 235 * don't expect to insert/remove anything from those spaces.
243 */ 236 */
244int 237int
245get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) 238get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
246{ 239{
247 sint16 newx, newy; 240 sint16 newx, newy;
248 int retval = 0; 241 int retval = 0;
249 maptile *mp; 242 maptile *mp;
250 243
251 if (out_of_map (oldmap, x, y))
252 return P_OUT_OF_MAP;
253 newx = x; 244 newx = x;
254 newy = y; 245 newy = y;
246
255 mp = get_map_from_coord (oldmap, &newx, &newy); 247 mp = get_map_from_coord (oldmap, &newx, &newy);
248
249 if (!mp)
250 return P_OUT_OF_MAP;
251
256 if (mp != oldmap) 252 if (mp != oldmap)
257 retval |= P_NEW_MAP; 253 retval |= P_NEW_MAP;
258 if (newmap)
259 *newmap = mp;
260 if (nx)
261 *nx = newx;
262 if (ny)
263 *ny = newy;
264 254
265 retval |= mp->spaces[newx + mp->width * newy].flags; 255 if (newmap) *newmap = mp;
256 if (nx) *nx = newx;
257 if (ny) *ny = newy;
266 258
267 return retval; 259 return retval | mp->at (newx, newy).flags ();
268} 260}
269 261
270/* 262/*
271 * Returns true if the given coordinate is blocked except by the 263 * Returns true if the given coordinate is blocked except by the
272 * object passed is not blocking. This is used with 264 * object passed is not blocking. This is used with
… …
295 } 287 }
296 288
297 /* Save some cycles - instead of calling get_map_flags(), just get the value 289 /* Save some cycles - instead of calling get_map_flags(), just get the value
298 * directly. 290 * directly.
299 */ 291 */
300 mflags = m->spaces[sx + m->width * sy].flags; 292 mflags = m->at (sx, sy).flags ();
301 293
302 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 294 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
303 295
304 /* If space is currently not blocked by anything, no need to 296 /* If space is currently not blocked by anything, no need to
305 * go further. Not true for players - all sorts of special 297 * go further. Not true for players - all sorts of special
… …
324 /* We basically go through the stack of objects, and if there is 316 /* We basically go through the stack of objects, and if there is
325 * some other object that has NO_PASS or FLAG_ALIVE set, return 317 * some other object that has NO_PASS or FLAG_ALIVE set, return
326 * true. If we get through the entire stack, that must mean 318 * true. If we get through the entire stack, that must mean
327 * ob is blocking it, so return 0. 319 * ob is blocking it, so return 0.
328 */ 320 */
329 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) 321 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
330 { 322 {
331 323
332 /* This must be before the checks below. Code for inventory checkers. */ 324 /* This must be before the checks below. Code for inventory checkers. */
333 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 325 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
334 { 326 {
… …
398 * 390 *
399 * Note this used to be arch_blocked, but with new movement 391 * Note this used to be arch_blocked, but with new movement
400 * code, we need to have actual object to check its move_type 392 * code, we need to have actual object to check its move_type
401 * against the move_block values. 393 * against the move_block values.
402 */ 394 */
403
404int 395int
405ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 396ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
406{ 397{
407 archetype *tmp; 398 archetype *tmp;
408 int flag; 399 int flag;
… …
414 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 405 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
415 if (flag & P_OUT_OF_MAP) 406 if (flag & P_OUT_OF_MAP)
416 return P_OUT_OF_MAP; 407 return P_OUT_OF_MAP;
417 408
418 /* don't have object, so don't know what types would block */ 409 /* don't have object, so don't know what types would block */
419 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 410 return m1->at (sx, sy).move_block;
420 } 411 }
421 412
422 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 413 for (tmp = ob->arch; tmp; tmp = tmp->more)
423 { 414 {
424 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 415 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
425 416
426 if (flag & P_OUT_OF_MAP) 417 if (flag & P_OUT_OF_MAP)
427 return P_OUT_OF_MAP; 418 return P_OUT_OF_MAP;
428 if (flag & P_IS_ALIVE) 419 if (flag & P_IS_ALIVE)
429 return P_IS_ALIVE; 420 return P_IS_ALIVE;
430 421
422 mapspace &ms = m1->at (sx, sy);
423
424
431 /* find_first_free_spot() calls this function. However, often 425 /* find_first_free_spot() calls this function. However, often
432 * ob doesn't have any move type (when used to place exits) 426 * ob doesn't have any move type (when used to place exits)
433 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 427 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
434 */ 428 */
435 429
436 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) 430 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
437 continue; 431 continue;
438 432
439 /* Note it is intentional that we check ob - the movement type of the 433 /* Note it is intentional that we check ob - the movement type of the
440 * head of the object should correspond for the entire object. 434 * head of the object should correspond for the entire object.
441 */ 435 */
442 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 436 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
443 return AB_NO_PASS; 437 return P_NO_PASS;
444
445 } 438 }
439
446 return 0; 440 return 0;
447} 441}
448 442
449/* When the map is loaded, load_object does not actually insert objects 443/* When the map is loaded, load_object does not actually insert objects
450 * into inventory, but just links them. What this does is go through 444 * into inventory, but just links them. What this does is go through
… …
477 * for objects whose arch says they are multipart yet according to the 471 * for objects whose arch says they are multipart yet according to the
478 * info we have, they only have the head (as would be expected when 472 * info we have, they only have the head (as would be expected when
479 * they are saved). We do have to look for the old maps that did save 473 * they are saved). We do have to look for the old maps that did save
480 * the more sections and not re-add sections for them. 474 * the more sections and not re-add sections for them.
481 */ 475 */
482
483static void 476static void
484link_multipart_objects (maptile *m) 477link_multipart_objects (maptile *m)
485{ 478{
486 int x, y; 479 int x, y;
487 object *tmp, *op, *last, *above; 480 object *tmp, *op, *last, *above;
488 archetype *at; 481 archetype *at;
489 482
490 for (x = 0; x < MAP_WIDTH (m); x++) 483 for (x = 0; x < m->width; x++)
491 for (y = 0; y < MAP_HEIGHT (m); y++) 484 for (y = 0; y < m->height; y++)
492 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) 485 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
493 { 486 {
494 above = tmp->above; 487 above = tmp->above;
495 488
496 /* already multipart - don't do anything more */ 489 /* already multipart - don't do anything more */
497 if (tmp->head || tmp->more) 490 if (tmp->head || tmp->more)
… …
532{ 525{
533 int i, j; 526 int i, j;
534 int unique; 527 int unique;
535 object *op, *prev = NULL, *last_more = NULL, *otmp; 528 object *op, *prev = NULL, *last_more = NULL, *otmp;
536 529
537 op = get_object (); 530 op = object::create ();
538 op->map = m; /* To handle buttons correctly */ 531 op->map = m; /* To handle buttons correctly */
539 532
540 while ((i = load_object (fp, op, mapflags))) 533 while ((i = load_object (fp, op, mapflags)))
541 { 534 {
542 /* if the archetype for the object is null, means that we 535 /* if the archetype for the object is null, means that we
… …
547 { 540 {
548 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 541 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
549 continue; 542 continue;
550 } 543 }
551 544
552
553 switch (i) 545 switch (i)
554 { 546 {
555 case LL_NORMAL: 547 case LL_NORMAL:
556 /* if we are loading an overlay, put the floors on the bottom */ 548 /* if we are loading an overlay, put the floors on the bottom */
557 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) 549 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
558 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); 550 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
559 else 551 else
560 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 552 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
561 553
562 if (op->inv) 554 if (op->inv)
563 sum_weight (op); 555 sum_weight (op);
564 556
565 prev = op, last_more = op; 557 prev = op, last_more = op;
566 break; 558 break;
567 559
568 case LL_MORE: 560 case LL_MORE:
569 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 561 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
570 op->head = prev, last_more->more = op, last_more = op; 562 op->head = prev, last_more->more = op, last_more = op;
571 break; 563 break;
572 } 564 }
573 565
574 if (mapflags & MAP_STYLE) 566 if (mapflags & MAP_STYLE)
575 remove_from_active_list (op); 567 remove_from_active_list (op);
576 568
577 op = get_object (); 569 op = object::create ();
578 op->map = m; 570 op->map = m;
579 } 571 }
580 572
581 for (i = 0; i < m->width; i++) 573 for (i = 0; i < m->width; i++)
582 { 574 {
583 for (j = 0; j < m->height; j++) 575 for (j = 0; j < m->height; j++)
584 { 576 {
585 unique = 0; 577 unique = 0;
586 /* check for unique items, or unique squares */ 578 /* check for unique items, or unique squares */
587 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 579 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
588 { 580 {
589 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 581 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
590 unique = 1; 582 unique = 1;
583
591 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 584 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
592 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); 585 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
593 } 586 }
594 } 587 }
595 } 588 }
596 589
597 free_object (op); 590 op->destroy ();
598 link_multipart_objects (m); 591 link_multipart_objects (m);
599} 592}
600 593
601/* This saves all the objects on the map in a non destructive fashion. 594/* This saves all the objects on the map in a non destructive fashion.
602 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 595 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
603 * and we only save the head of multi part objects - this is needed 596 * and we only save the head of multi part objects - this is needed
604 * in order to do map tiling properly. 597 * in order to do map tiling properly.
605 */ 598 */
606void 599void
607save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) 600save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
608{ 601{
609 int i, j = 0, unique = 0; 602 int i, j = 0, unique = 0;
610 object *op; 603 object *op;
611 604
612 /* first pass - save one-part objects */ 605 /* first pass - save one-part objects */
613 for (i = 0; i < MAP_WIDTH (m); i++) 606 for (i = 0; i < m->width; i++)
614 for (j = 0; j < MAP_HEIGHT (m); j++) 607 for (j = 0; j < m->height; j++)
615 { 608 {
616 unique = 0; 609 unique = 0;
610
617 for (op = get_map_ob (m, i, j); op; op = op->above) 611 for (op = m->at (i, j).bot; op; op = op->above)
618 { 612 {
619 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 613 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
620 unique = 1; 614 unique = 1;
621 615
622 if (op->type == PLAYER) 616 if (!op->can_map_save ())
623 {
624 LOG (llevDebug, "Player on map that is being saved\n");
625 continue;
626 }
627
628 if (op->head || op->owner)
629 continue; 617 continue;
630 618
631 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 619 if (unique || op->flag [FLAG_UNIQUE])
632 save_object (fp2, op, 3); 620 save_object (fp2, op, 1);
633 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 621 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
634 save_object (fp, op, 3); 622 save_object (fp, op, 1);
635 623 }
636 } /* for this space */ 624 }
637 } /* for this j */
638} 625}
639 626
640maptile::maptile () 627maptile::maptile ()
641{ 628{
642 in_memory = MAP_SWAPPED; 629 in_memory = MAP_SWAPPED;
630
643 /* The maps used to pick up default x and y values from the 631 /* The maps used to pick up default x and y values from the
644 * map archetype. Mimic that behaviour. 632 * map archetype. Mimic that behaviour.
645 */ 633 */
646 MAP_WIDTH (this) = 16; 634 width = 16;
647 MAP_HEIGHT (this) = 16; 635 height = 16;
648 MAP_RESET_TIMEOUT (this) = 0; 636 reset_timeout = 0;
649 MAP_TIMEOUT (this) = 300; 637 timeout = 300;
650 MAP_ENTER_X (this) = 0; 638 enter_x = 0;
651 MAP_ENTER_Y (this) = 0; 639 enter_y = 0;
652 /*set part to -1 indicating conversion to weather map not yet done */ 640 /*set part to -1 indicating conversion to weather map not yet done */
653 MAP_WORLDPARTX (this) = -1; 641 worldpartx = -1;
654 MAP_WORLDPARTY (this) = -1; 642 worldparty = -1;
643}
644
645void
646maptile::link ()
647{
648 next = first_map;
649 first_map = this;
650}
651
652void
653maptile::unlink ()
654{
655 if (first_map == this)
656 first_map = next;
657 else
658 {
659 for_all_maps (m)
660 if (m->next = this)
661 {
662 m->next = next;
663 return;
664 }
665
666 LOG (llevError, "maptile::unlink() map not on list: %s\n", path);
667 }
655} 668}
656 669
657/* 670/*
658 * Allocates, initialises, and returns a pointer to a maptile. 671 * Allocates, initialises, and returns a pointer to a maptile.
659 * Modified to no longer take a path option which was not being 672 * Modified to no longer take a path option which was not being
660 * used anyways. MSW 2001-07-01 673 * used anyways. MSW 2001-07-01
661 */ 674 */
662maptile * 675maptile *
663get_linked_map (void) 676get_linked_map (void)
664{ 677{
665 maptile *mp, *map = new maptile; 678 maptile *map = new maptile;
666 679 map->link ();
667 for (mp = first_map; mp && mp->next; mp = mp->next);
668
669 if (mp == NULL)
670 first_map = map;
671 else
672 mp->next = map;
673
674 return map; 680 return map;
675} 681}
676 682
677/* 683/*
678 * Allocates the arrays contained in a maptile. 684 * Allocates the arrays contained in a maptile.
… …
689 * that is their poor assumption. 695 * that is their poor assumption.
690 */ 696 */
691 if (spaces) 697 if (spaces)
692 { 698 {
693 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); 699 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
694 free (spaces); 700 sfree (spaces, size ());
695 } 701 }
696 702
697 spaces = (MapSpace *) 703 spaces = salloc0<mapspace> (size ());
698 calloc (1, width * height * sizeof (MapSpace));
699
700 if (!spaces)
701 fatal (OUT_OF_MEMORY);
702} 704}
703 705
704/* Create and returns a map of the specific size. Used 706/* Create and returns a map of the specific size. Used
705 * in random map code and the editor. 707 * in random map code and the editor.
706 */ 708 */
707maptile * 709maptile *
708get_empty_map (int sizex, int sizey) 710get_empty_map (int sizex, int sizey)
709{ 711{
710 maptile *m = get_linked_map (); 712 maptile *m = get_linked_map ();
711 713
712 m->width = sizex; 714 m->width = sizex;
713 m->height = sizey; 715 m->height = sizey;
714 m->in_memory = MAP_SWAPPED; 716 m->in_memory = MAP_SWAPPED;
717
715 m->allocate (); 718 m->allocate ();
716 719
717 return m; 720 return m;
718} 721}
719 722
720/* Takes a string from a map definition and outputs a pointer to the array of shopitems 723/* Takes a string from a map definition and outputs a pointer to the array of shopitems
721 * corresponding to that string. Memory is allocated for this, it must be freed 724 * corresponding to that string. Memory is allocated for this, it must be freed
722 * at a later date. 725 * at a later date.
723 * Called by parse_map_headers below. 726 * Called by parse_map_headers below.
724 */ 727 */
725
726static shopitems * 728static shopitems *
727parse_shop_string (const char *input_string) 729parse_shop_string (const char *input_string)
728{ 730{
729 char *shop_string, *p, *q, *next_semicolon, *next_colon; 731 char *shop_string, *p, *q, *next_semicolon, *next_colon;
730 shopitems *items = NULL; 732 shopitems *items = NULL;
731 int i = 0, number_of_entries = 0; 733 int i = 0, number_of_entries = 0;
732 const typedata *current_type; 734 const typedata *current_type;
733 735
734 shop_string = strdup_local (input_string); 736 shop_string = strdup (input_string);
735 p = shop_string; 737 p = shop_string;
736 /* first we'll count the entries, we'll need that for allocating the array shortly */ 738 /* first we'll count the entries, we'll need that for allocating the array shortly */
737 while (p) 739 while (p)
738 { 740 {
739 p = strchr (p, ';'); 741 p = strchr (p, ';');
740 number_of_entries++; 742 number_of_entries++;
741 if (p) 743 if (p)
742 p++; 744 p++;
743 } 745 }
746
744 p = shop_string; 747 p = shop_string;
745 strip_endline (p); 748 strip_endline (p);
746 items = new shopitems[number_of_entries + 1]; 749 items = new shopitems[number_of_entries + 1];
747 for (i = 0; i < number_of_entries; i++) 750 for (i = 0; i < number_of_entries; i++)
748 { 751 {
749 if (!p) 752 if (!p)
750 { 753 {
751 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); 754 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
752 break; 755 break;
753 } 756 }
757
754 next_semicolon = strchr (p, ';'); 758 next_semicolon = strchr (p, ';');
755 next_colon = strchr (p, ':'); 759 next_colon = strchr (p, ':');
756 /* if there is a stregth specified, figure out what it is, we'll need it soon. */ 760 /* if there is a stregth specified, figure out what it is, we'll need it soon. */
757 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 761 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
758 items[i].strength = atoi (strchr (p, ':') + 1); 762 items[i].strength = atoi (strchr (p, ':') + 1);
… …
785 * the next entry while we're at it, better print a warning 789 * the next entry while we're at it, better print a warning
786 */ 790 */
787 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); 791 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
788 } 792 }
789 } 793 }
794
790 items[i].index = number_of_entries; 795 items[i].index = number_of_entries;
791 if (next_semicolon) 796 if (next_semicolon)
792 p = ++next_semicolon; 797 p = ++next_semicolon;
793 else 798 else
794 p = NULL; 799 p = NULL;
795 } 800 }
801
796 free (shop_string); 802 free (shop_string);
797 return items; 803 return items;
798} 804}
799 805
800/* opposite of parse string, this puts the string that was originally fed in to 806/* opposite of parse string, this puts the string that was originally fed in to
… …
809 for (i = 0; i < m->shopitems[0].index; i++) 815 for (i = 0; i < m->shopitems[0].index; i++)
810 { 816 {
811 if (m->shopitems[i].typenum) 817 if (m->shopitems[i].typenum)
812 { 818 {
813 if (m->shopitems[i].strength) 819 if (m->shopitems[i].strength)
814 {
815 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 820 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
816 }
817 else 821 else
818 sprintf (tmp, "%s;", m->shopitems[i].name); 822 sprintf (tmp, "%s;", m->shopitems[i].name);
819 } 823 }
820 else 824 else
821 { 825 {
822 if (m->shopitems[i].strength) 826 if (m->shopitems[i].strength)
823 {
824 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 827 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
825 }
826 else 828 else
827 sprintf (tmp, "*"); 829 sprintf (tmp, "*");
828 } 830 }
831
829 strcat (output_string, tmp); 832 strcat (output_string, tmp);
830 } 833 }
831} 834}
832 835
833/* This loads the header information of the map. The header 836/* This loads the header information of the map. The header
… …
925 * with nothing between). There is no reason in those cases to 928 * with nothing between). There is no reason in those cases to
926 * keep the empty message. Also, msgbuf contains garbage data 929 * keep the empty message. Also, msgbuf contains garbage data
927 * when msgpos is zero, so copying it results in crashes 930 * when msgpos is zero, so copying it results in crashes
928 */ 931 */
929 if (msgpos != 0) 932 if (msgpos != 0)
930 m->msg = strdup_local (msgbuf); 933 m->msg = strdup (msgbuf);
931 } 934 }
932 else if (!strcmp (key, "maplore")) 935 else if (!strcmp (key, "maplore"))
933 { 936 {
934 while (fgets (buf, HUGE_BUF, fp) != NULL) 937 while (fgets (buf, HUGE_BUF, fp) != NULL)
935 { 938 {
… …
941 strcpy (maplorebuf + maplorepos, buf); 944 strcpy (maplorebuf + maplorepos, buf);
942 maplorepos += strlen (buf); 945 maplorepos += strlen (buf);
943 } 946 }
944 } 947 }
945 if (maplorepos != 0) 948 if (maplorepos != 0)
946 m->maplore = strdup_local (maplorebuf); 949 m->maplore = strdup (maplorebuf);
947 } 950 }
948 else if (!strcmp (key, "end")) 951 else if (!strcmp (key, "end"))
949 { 952 {
950 break; 953 break;
951 } 954 }
… …
960 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); 963 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
961 } 964 }
962 else if (!strcmp (key, "name")) 965 else if (!strcmp (key, "name"))
963 { 966 {
964 *end = 0; 967 *end = 0;
965 m->name = strdup_local (value); 968 m->name = strdup (value);
966 } 969 }
967 /* first strcmp value on these are old names supported 970 /* first strcmp value on these are old names supported
968 * for compatibility reasons. The new values (second) are 971 * for compatibility reasons. The new values (second) are
969 * what really should be used. 972 * what really should be used.
970 */ 973 */
971 else if (!strcmp (key, "oid")) 974 else if (!strcmp (key, "oid"))
972 {
973 fp.get (m, atoi (value)); 975 fp.get (m, atoi (value));
974 }
975 else if (!strcmp (key, "attach")) 976 else if (!strcmp (key, "attach"))
976 {
977 m->attach = value; 977 m->attach = value;
978 }
979 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) 978 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
980 {
981 m->enter_x = atoi (value); 979 m->enter_x = atoi (value);
982 }
983 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) 980 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
984 {
985 m->enter_y = atoi (value); 981 m->enter_y = atoi (value);
986 }
987 else if (!strcmp (key, "x") || !strcmp (key, "width")) 982 else if (!strcmp (key, "x") || !strcmp (key, "width"))
988 {
989 m->width = atoi (value); 983 m->width = atoi (value);
990 }
991 else if (!strcmp (key, "y") || !strcmp (key, "height")) 984 else if (!strcmp (key, "y") || !strcmp (key, "height"))
992 {
993 m->height = atoi (value); 985 m->height = atoi (value);
994 }
995 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) 986 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
996 {
997 m->reset_timeout = atoi (value); 987 m->reset_timeout = atoi (value);
998 }
999 else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) 988 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1000 {
1001 m->timeout = atoi (value); 989 m->timeout = atoi (value);
1002 }
1003 else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) 990 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1004 { 991 m->difficulty = clamp (atoi (value), 1, settings.max_level);
1005 m->difficulty = atoi (value);
1006 }
1007 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) 992 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1008 {
1009 m->darkness = atoi (value); 993 m->darkness = atoi (value);
1010 }
1011 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) 994 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1012 {
1013 m->fixed_resettime = atoi (value); 995 m->fixed_resettime = atoi (value);
1014 }
1015 else if (!strcmp (key, "unique")) 996 else if (!strcmp (key, "unique"))
1016 {
1017 m->unique = atoi (value); 997 m->unique = atoi (value);
1018 }
1019 else if (!strcmp (key, "template")) 998 else if (!strcmp (key, "template"))
1020 {
1021 m->templatemap = atoi (value); 999 m->templatemap = atoi (value);
1022 }
1023 else if (!strcmp (key, "region")) 1000 else if (!strcmp (key, "region"))
1024 {
1025 m->region = get_region_by_name (value); 1001 m->region = get_region_by_name (value);
1026 }
1027 else if (!strcmp (key, "shopitems")) 1002 else if (!strcmp (key, "shopitems"))
1028 { 1003 {
1029 *end = 0; 1004 *end = 0;
1030 m->shopitems = parse_shop_string (value); 1005 m->shopitems = parse_shop_string (value);
1031 } 1006 }
1032 else if (!strcmp (key, "shopgreed")) 1007 else if (!strcmp (key, "shopgreed"))
1033 {
1034 m->shopgreed = atof (value); 1008 m->shopgreed = atof (value);
1035 }
1036 else if (!strcmp (key, "shopmin")) 1009 else if (!strcmp (key, "shopmin"))
1037 {
1038 m->shopmin = atol (value); 1010 m->shopmin = atol (value);
1039 }
1040 else if (!strcmp (key, "shopmax")) 1011 else if (!strcmp (key, "shopmax"))
1041 {
1042 m->shopmax = atol (value); 1012 m->shopmax = atol (value);
1043 }
1044 else if (!strcmp (key, "shoprace")) 1013 else if (!strcmp (key, "shoprace"))
1045 { 1014 {
1046 *end = 0; 1015 *end = 0;
1047 m->shoprace = strdup_local (value); 1016 m->shoprace = strdup (value);
1048 } 1017 }
1049 else if (!strcmp (key, "outdoor")) 1018 else if (!strcmp (key, "outdoor"))
1050 {
1051 m->outdoor = atoi (value); 1019 m->outdoor = atoi (value);
1052 }
1053 else if (!strcmp (key, "temp")) 1020 else if (!strcmp (key, "temp"))
1054 {
1055 m->temp = atoi (value); 1021 m->temp = atoi (value);
1056 }
1057 else if (!strcmp (key, "pressure")) 1022 else if (!strcmp (key, "pressure"))
1058 {
1059 m->pressure = atoi (value); 1023 m->pressure = atoi (value);
1060 }
1061 else if (!strcmp (key, "humid")) 1024 else if (!strcmp (key, "humid"))
1062 {
1063 m->humid = atoi (value); 1025 m->humid = atoi (value);
1064 }
1065 else if (!strcmp (key, "windspeed")) 1026 else if (!strcmp (key, "windspeed"))
1066 {
1067 m->windspeed = atoi (value); 1027 m->windspeed = atoi (value);
1068 }
1069 else if (!strcmp (key, "winddir")) 1028 else if (!strcmp (key, "winddir"))
1070 {
1071 m->winddir = atoi (value); 1029 m->winddir = atoi (value);
1072 }
1073 else if (!strcmp (key, "sky")) 1030 else if (!strcmp (key, "sky"))
1074 {
1075 m->sky = atoi (value); 1031 m->sky = atoi (value);
1076 }
1077 else if (!strcmp (key, "nosmooth")) 1032 else if (!strcmp (key, "nosmooth"))
1078 {
1079 m->nosmooth = atoi (value); 1033 m->nosmooth = atoi (value);
1080 }
1081 else if (!strncmp (key, "tile_path_", 10)) 1034 else if (!strncmp (key, "tile_path_", 10))
1082 { 1035 {
1083 int tile = atoi (key + 10); 1036 int tile = atoi (key + 10);
1084 1037
1085 if (tile < 1 || tile > 4) 1038 if (tile < 1 || tile > 4)
… …
1118 } 1071 }
1119 1072
1120 if (editor) 1073 if (editor)
1121 { 1074 {
1122 /* Use the value as in the file. */ 1075 /* Use the value as in the file. */
1123 m->tile_path[tile - 1] = strdup_local (value); 1076 m->tile_path[tile - 1] = strdup (value);
1124 } 1077 }
1125 else if (path != NULL) 1078 else if (path != NULL)
1126 { 1079 {
1127 /* Use the normalized value. */ 1080 /* Use the normalized value. */
1128 m->tile_path[tile - 1] = strdup_local (path); 1081 m->tile_path[tile - 1] = strdup (path);
1129 } 1082 }
1130 } /* end if tile direction (in)valid */ 1083 } /* end if tile direction (in)valid */
1131 } 1084 }
1132 else 1085 else
1133 {
1134 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); 1086 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1135 }
1136 } 1087 }
1088
1137 if (!key || strcmp (key, "end")) 1089 if (!key || strcmp (key, "end"))
1138 { 1090 {
1139 LOG (llevError, "Got premature eof on map header!\n"); 1091 LOG (llevError, "Got premature eof on map header!\n");
1140 return 1; 1092 return 1;
1141 } 1093 }
1094
1142 return 0; 1095 return 0;
1143} 1096}
1144 1097
1145/* 1098/*
1146 * Opens the file "filename" and reads information about the map 1099 * Opens the file "filename" and reads information about the map
… …
1151 * MAP_BLOCK, in which case we block on this load. This happens in all 1104 * MAP_BLOCK, in which case we block on this load. This happens in all
1152 * cases, no matter if this flag is set or not. 1105 * cases, no matter if this flag is set or not.
1153 * MAP_STYLE: style map - don't add active objects, don't add to server 1106 * MAP_STYLE: style map - don't add active objects, don't add to server
1154 * managed map list. 1107 * managed map list.
1155 */ 1108 */
1156
1157maptile * 1109maptile *
1158load_original_map (const char *filename, int flags) 1110load_original_map (const char *filename, int flags)
1159{ 1111{
1160 maptile *m; 1112 maptile *m;
1161 char pathname[MAX_BUF]; 1113 char pathname[MAX_BUF];
… …
1179 strcpy (m->path, filename); 1131 strcpy (m->path, filename);
1180 if (load_map_header (thawer, m)) 1132 if (load_map_header (thawer, m))
1181 { 1133 {
1182 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1134 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1183 delete_map (m); 1135 delete_map (m);
1184 return NULL; 1136 return 0;
1185 } 1137 }
1186 1138
1187 m->allocate (); 1139 m->allocate ();
1188 1140
1189 m->in_memory = MAP_LOADING; 1141 m->in_memory = MAP_LOADING;
1190 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1142 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1191 1143
1192 m->in_memory = MAP_IN_MEMORY; 1144 m->in_memory = MAP_IN_MEMORY;
1193 if (!MAP_DIFFICULTY (m)) 1145 if (!m->difficulty)
1194 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1146 m->difficulty = calculate_difficulty (m);
1195 set_map_reset_time (m); 1147 set_map_reset_time (m);
1196 m->instantiate (); 1148 m->instantiate ();
1197 return (m); 1149 return (m);
1198} 1150}
1199 1151
1200/* 1152/*
1201 * Loads a map, which has been loaded earlier, from file. 1153 * Loads a map, which has been loaded earlier, from file.
1202 * Return the map object we load into (this can change from the passed 1154 * Return the map object we load into (this can change from the passed
1203 * option if we can't find the original map) 1155 * option if we can't find the original map)
1204 */ 1156 */
1205
1206static maptile * 1157static maptile *
1207load_temporary_map (maptile *m) 1158load_temporary_map (maptile *m)
1208{ 1159{
1209 char buf[MAX_BUF]; 1160 char buf[MAX_BUF];
1210 1161
… …
1254/* 1205/*
1255 * Loads a map, which has been loaded earlier, from file. 1206 * Loads a map, which has been loaded earlier, from file.
1256 * Return the map object we load into (this can change from the passed 1207 * Return the map object we load into (this can change from the passed
1257 * option if we can't find the original map) 1208 * option if we can't find the original map)
1258 */ 1209 */
1259
1260maptile * 1210maptile *
1261load_overlay_map (const char *filename, maptile *m) 1211load_overlay_map (const char *filename, maptile *m)
1262{ 1212{
1263 char pathname[MAX_BUF]; 1213 char pathname[MAX_BUF];
1264 1214
… …
1272 if (load_map_header (thawer, m)) 1222 if (load_map_header (thawer, m))
1273 { 1223 {
1274 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1224 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1275 delete_map (m); 1225 delete_map (m);
1276 m = load_original_map (m->path, 0); 1226 m = load_original_map (m->path, 0);
1277 return NULL; 1227 return 0;
1278 } 1228 }
1279 /*m->allocate ();*/ 1229 /*m->allocate ();*/
1280 1230
1281 m->in_memory = MAP_LOADING; 1231 m->in_memory = MAP_LOADING;
1282 load_objects (m, thawer, MAP_OVERLAY); 1232 load_objects (m, thawer, MAP_OVERLAY);
… …
1294delete_unique_items (maptile *m) 1244delete_unique_items (maptile *m)
1295{ 1245{
1296 int i, j, unique; 1246 int i, j, unique;
1297 object *op, *next; 1247 object *op, *next;
1298 1248
1299 for (i = 0; i < MAP_WIDTH (m); i++) 1249 for (i = 0; i < m->width; i++)
1300 for (j = 0; j < MAP_HEIGHT (m); j++) 1250 for (j = 0; j < m->height; j++)
1301 { 1251 {
1302 unique = 0; 1252 unique = 0;
1253
1303 for (op = get_map_ob (m, i, j); op; op = next) 1254 for (op = GET_MAP_OB (m, i, j); op; op = next)
1304 { 1255 {
1305 next = op->above; 1256 next = op->above;
1257
1306 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1258 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1307 unique = 1; 1259 unique = 1;
1260
1308 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1261 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1309 { 1262 {
1310 clean_object (op); 1263 op->destroy_inv (false);
1311 if (QUERY_FLAG (op, FLAG_IS_LINKED)) 1264 op->destroy ();
1312 remove_button_link (op);
1313 remove_ob (op);
1314 free_object (op);
1315 } 1265 }
1316 } 1266 }
1317 } 1267 }
1318} 1268}
1319 1269
1320
1321/* 1270/*
1322 * Loads unique objects from file(s) into the map which is in memory 1271 * Loads unique objects from file(s) into the map which is in memory
1323 * m is the map to load unique items into. 1272 * m is the map to load unique items into.
1324 */ 1273 */
1325static void 1274static void
… …
1344 return; 1293 return;
1345 1294
1346 m->in_memory = MAP_LOADING; 1295 m->in_memory = MAP_LOADING;
1347 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1296 if (m->tmpname == NULL) /* if we have loaded unique items from */
1348 delete_unique_items (m); /* original map before, don't duplicate them */ 1297 delete_unique_items (m); /* original map before, don't duplicate them */
1298
1349 load_objects (m, thawer, 0); 1299 load_objects (m, thawer, 0);
1350 1300
1351 m->in_memory = MAP_IN_MEMORY; 1301 m->in_memory = MAP_IN_MEMORY;
1352} 1302}
1353
1354 1303
1355/* 1304/*
1356 * Saves a map to file. If flag is set, it is saved into the same 1305 * Saves a map to file. If flag is set, it is saved into the same
1357 * file it was (originally) loaded from. Otherwise a temporary 1306 * file it was (originally) loaded from. Otherwise a temporary
1358 * filename will be genarated, and the file will be stored there. 1307 * filename will be genarated, and the file will be stored there.
1359 * The temporary filename will be stored in the maptileure. 1308 * The temporary filename will be stored in the maptileure.
1360 * If the map is unique, we also save to the filename in the map 1309 * If the map is unique, we also save to the filename in the map
1361 * (this should have been updated when first loaded) 1310 * (this should have been updated when first loaded)
1362 */ 1311 */
1363
1364int 1312int
1365new_save_map (maptile *m, int flag) 1313new_save_map (maptile *m, int flag)
1366{ 1314{
1367 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1315 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1368 int i; 1316 int i;
… …
1388 make_path_to_file (filename); 1336 make_path_to_file (filename);
1389 } 1337 }
1390 else 1338 else
1391 { 1339 {
1392 if (!m->tmpname) 1340 if (!m->tmpname)
1393 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1341 m->tmpname = tempnam (settings.tmpdir, NULL);
1394 1342
1395 strcpy (filename, m->tmpname); 1343 strcpy (filename, m->tmpname);
1396 } 1344 }
1397 1345
1398 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1346 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1500 freezer.save (filename); 1448 freezer.save (filename);
1501 1449
1502 return 0; 1450 return 0;
1503} 1451}
1504 1452
1505
1506/*
1507 * Remove and free all objects in the inventory of the given object.
1508 * object.c ?
1509 */
1510
1511void
1512clean_object (object *op)
1513{
1514 object *tmp, *next;
1515
1516 for (tmp = op->inv; tmp; tmp = next)
1517 {
1518 next = tmp->below;
1519 clean_object (tmp);
1520 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1521 remove_button_link (tmp);
1522 remove_ob (tmp);
1523 free_object (tmp);
1524 }
1525}
1526
1527/* 1453/*
1528 * Remove and free all objects in the given map. 1454 * Remove and free all objects in the given map.
1529 */ 1455 */
1530
1531void 1456void
1532free_all_objects (maptile *m) 1457free_all_objects (maptile *m)
1533{ 1458{
1534 int i, j; 1459 if (!m->spaces)
1535 object *op; 1460 return;
1536 1461
1537 for (i = 0; i < MAP_WIDTH (m); i++) 1462 for (int i = 0; i < m->width; i++)
1538 for (j = 0; j < MAP_HEIGHT (m); j++) 1463 for (int j = 0; j < m->height; j++)
1539 { 1464 {
1540 object *previous_obj = NULL; 1465 mapspace &ms = m->at (i, j);
1541 1466
1542 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1467 while (object *op = ms.bot)
1543 { 1468 {
1544 if (op == previous_obj)
1545 {
1546 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1547 break;
1548 }
1549 previous_obj = op;
1550 if (op->head != NULL) 1469 if (op->head)
1551 op = op->head; 1470 op = op->head;
1552 1471
1553 /* If the map isn't in memory, free_object will remove and 1472 op->destroy_inv (false);
1554 * free objects in op's inventory. So let it do the job. 1473 op->destroy ();
1555 */
1556 if (m->in_memory == MAP_IN_MEMORY)
1557 clean_object (op);
1558 remove_ob (op);
1559 free_object (op);
1560 } 1474 }
1561 } 1475 }
1562} 1476}
1563 1477
1564/* 1478/*
1565 * Frees everything allocated by the given maptileure. 1479 * Frees everything allocated by the given maptileure.
1566 * don't free tmpname - our caller is left to do that 1480 * don't free tmpname - our caller is left to do that
1567 */ 1481 */
1568
1569void 1482void
1570free_map (maptile *m, int flag) 1483free_map (maptile *m, int flag)
1571{ 1484{
1572 int i; 1485 if (!m->in_memory) //TODO: makes no sense to me?
1573
1574 if (!m->in_memory)
1575 {
1576 LOG (llevError, "Trying to free freed map.\n");
1577 return; 1486 return;
1578 } 1487
1488 m->in_memory = MAP_SAVING;
1489
1490 // TODO: use new/delete
1491
1579 if (flag && m->spaces) 1492 if (flag && m->spaces)
1580 free_all_objects (m); 1493 free_all_objects (m);
1581 if (m->name) 1494
1582 FREE_AND_CLEAR (m->name); 1495 sfree (m->spaces, m->size ()), m->spaces = 0;
1583 if (m->spaces) 1496
1584 FREE_AND_CLEAR (m->spaces); 1497 free (m->name), m->name = 0;
1585 if (m->msg) 1498 free (m->msg), m->msg = 0;
1586 FREE_AND_CLEAR (m->msg); 1499 free (m->maplore), m->maplore = 0;
1587 if (m->maplore) 1500 free (m->shoprace), m->shoprace = 0;
1588 FREE_AND_CLEAR (m->maplore); 1501 delete [] m->shopitems, m->shopitems = 0;
1589 if (m->shopitems) 1502
1590 delete[]m->shopitems;
1591 m->shopitems = 0;
1592 if (m->shoprace)
1593 FREE_AND_CLEAR (m->shoprace);
1594 if (m->buttons) 1503 if (m->buttons)
1595 free_objectlinkpt (m->buttons); 1504 free_objectlinkpt (m->buttons), m->buttons = 0;
1596 m->buttons = NULL; 1505
1597 for (i = 0; i < 4; i++) 1506 for (int i = 0; i < 4; i++)
1598 { 1507 free (m->tile_path[i]), m->tile_path[i] = 0;
1599 if (m->tile_path[i]) 1508
1600 FREE_AND_CLEAR (m->tile_path[i]);
1601 m->tile_map[i] = NULL;
1602 }
1603 m->in_memory = MAP_SWAPPED; 1509 m->in_memory = MAP_SWAPPED;
1604} 1510}
1605 1511
1606/* 1512maptile::~maptile ()
1607 * function: vanish maptile 1513{
1608 * m : pointer to maptile, if NULL no action 1514 assert (destroyed ());
1609 * this deletes all the data on the map (freeing pointers) 1515}
1610 * and then removes this map from the global linked list of maps. 1516
1517void
1518maptile::do_destroy ()
1519{
1520 attachable::do_destroy ();
1521
1522 unlink ();
1523
1524 free_map (this, 1);
1525 free (tmpname), tmpname = 0;
1526
1527 /* We need to look through all the maps and see if any maps
1528 * are pointing at this one for tiling information. Since
1529 * tiling can be asymetric, we just can not look to see which
1530 * maps this map tiles with and clears those.
1611 */ 1531 */
1532 //TODO: non-euclidean-tiling MUST GO
1533 for_all_maps (m)
1534 for (int i = 0; i < 4; i++)
1535 if (m->tile_map[i] == this)
1536 m->tile_map[i] = 0;
1537}
1612 1538
1539//TODO: must go
1613void 1540void
1614delete_map (maptile *m) 1541delete_map (maptile *m)
1615{ 1542{
1616 maptile *tmp, *last;
1617 int i;
1618
1619 if (!m) 1543 if (m)
1620 return; 1544 m->destroy ();
1621
1622 m->clear ();
1623
1624 if (m->in_memory == MAP_IN_MEMORY)
1625 {
1626 /* change to MAP_SAVING, even though we are not,
1627 * so that remove_ob doesn't do as much work.
1628 */
1629 m->in_memory = MAP_SAVING;
1630 free_map (m, 1);
1631 }
1632 /* move this out of free_map, since tmpname can still be needed if
1633 * the map is swapped out.
1634 */
1635 if (m->tmpname)
1636 {
1637 free (m->tmpname);
1638 m->tmpname = NULL;
1639 }
1640 last = NULL;
1641 /* We need to look through all the maps and see if any maps
1642 * are pointing at this one for tiling information. Since
1643 * tiling can be assymetric, we just can not look to see which
1644 * maps this map tiles with and clears those.
1645 */
1646 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1647 {
1648 if (tmp->next == m)
1649 last = tmp;
1650
1651 /* This should hopefully get unrolled on a decent compiler */
1652 for (i = 0; i < 4; i++)
1653 if (tmp->tile_map[i] == m)
1654 tmp->tile_map[i] = NULL;
1655 }
1656
1657 /* If last is null, then this should be the first map in the list */
1658 if (!last)
1659 {
1660 if (m == first_map)
1661 first_map = m->next;
1662 else
1663 /* m->path is a static char, so should hopefully still have
1664 * some useful data in it.
1665 */
1666 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1667 }
1668 else
1669 last->next = m->next;
1670
1671 delete m;
1672} 1545}
1673
1674
1675 1546
1676/* 1547/*
1677 * Makes sure the given map is loaded and swapped in. 1548 * Makes sure the given map is loaded and swapped in.
1678 * name is path name of the map. 1549 * name is path name of the map.
1679 * flags meaning: 1550 * flags meaning:
… …
1682 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. 1553 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1683 * dont do any more name translation on it. 1554 * dont do any more name translation on it.
1684 * 1555 *
1685 * Returns a pointer to the given map. 1556 * Returns a pointer to the given map.
1686 */ 1557 */
1687
1688maptile * 1558maptile *
1689ready_map_name (const char *name, int flags) 1559ready_map_name (const char *name, int flags)
1690{ 1560{
1691 maptile *m;
1692
1693 if (!name) 1561 if (!name)
1694 return (NULL); 1562 return 0;
1695 1563
1696 /* Have we been at this level before? */ 1564 /* Have we been at this level before? */
1697 m = has_been_loaded (name); 1565 maptile *m = has_been_loaded (name);
1698 1566
1699 /* Map is good to go, so just return it */ 1567 /* Map is good to go, so just return it */
1700 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) 1568 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1701 {
1702 return m; 1569 return m;
1703 }
1704 1570
1705 /* unique maps always get loaded from their original location, and never 1571 /* unique maps always get loaded from their original location, and never
1706 * a temp location. Likewise, if map_flush is set, or we have never loaded 1572 * a temp location. Likewise, if map_flush is set, or we have never loaded
1707 * this map, load it now. I removed the reset checking from here - 1573 * this map, load it now. I removed the reset checking from here -
1708 * it seems the probability of a player trying to enter a map that should 1574 * it seems the probability of a player trying to enter a map that should
… …
1710 * a bit cleaner (and players probably shouldn't rely on exact timing for 1576 * a bit cleaner (and players probably shouldn't rely on exact timing for
1711 * resets in any case - if they really care, they should use the 'maps command. 1577 * resets in any case - if they really care, they should use the 'maps command.
1712 */ 1578 */
1713 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1579 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1714 { 1580 {
1715
1716 /* first visit or time to reset */ 1581 /* first visit or time to reset */
1717 if (m) 1582 if (m)
1718 { 1583 {
1719 clean_tmp_map (m); /* Doesn't make much difference */ 1584 clean_tmp_map (m); /* Doesn't make much difference */
1720 delete_map (m); 1585 delete_map (m);
… …
1724 if (flags & MAP_PLAYER_UNIQUE) 1589 if (flags & MAP_PLAYER_UNIQUE)
1725 LOG (llevDebug, "Trying to load map %s.\n", name); 1590 LOG (llevDebug, "Trying to load map %s.\n", name);
1726 else 1591 else
1727 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name)); 1592 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1728 1593
1729 //eval_pv ("$x = Event::time", 1);//D
1730 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE)))) 1594 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1731 return (NULL); 1595 return (NULL);
1732 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1733 1596
1734 fix_auto_apply (m); /* Chests which open as default */ 1597 fix_auto_apply (m); /* Chests which open as default */
1735 1598
1736 /* If a player unique map, no extra unique object file to load. 1599 /* If a player unique map, no extra unique object file to load.
1737 * if from the editor, likewise. 1600 * if from the editor, likewise.
… …
1807 int x, y, i; 1670 int x, y, i;
1808 long monster_cnt = 0; 1671 long monster_cnt = 0;
1809 double avgexp = 0; 1672 double avgexp = 0;
1810 sint64 total_exp = 0; 1673 sint64 total_exp = 0;
1811 1674
1812 if (MAP_DIFFICULTY (m)) 1675 if (m->difficulty)
1813 { 1676 {
1814 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1677 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1815 return MAP_DIFFICULTY (m); 1678 return m->difficulty;
1816 } 1679 }
1817 1680
1818 for (x = 0; x < MAP_WIDTH (m); x++) 1681 for (x = 0; x < m->width; x++)
1819 for (y = 0; y < MAP_HEIGHT (m); y++) 1682 for (y = 0; y < m->height; y++)
1820 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 1683 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1821 { 1684 {
1822 if (QUERY_FLAG (op, FLAG_MONSTER)) 1685 if (QUERY_FLAG (op, FLAG_MONSTER))
1823 { 1686 {
1824 total_exp += op->stats.exp; 1687 total_exp += op->stats.exp;
1825 monster_cnt++; 1688 monster_cnt++;
… …
1873 if (first_map->in_memory == MAP_SAVING) 1736 if (first_map->in_memory == MAP_SAVING)
1874 first_map->in_memory = MAP_IN_MEMORY; 1737 first_map->in_memory = MAP_IN_MEMORY;
1875 delete_map (first_map); 1738 delete_map (first_map);
1876 real_maps++; 1739 real_maps++;
1877 } 1740 }
1741
1878 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); 1742 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1879} 1743}
1880 1744
1881/* change_map_light() - used to change map light level (darkness) 1745/* change_map_light() - used to change map light level (darkness)
1882 * up or down. Returns true if successful. It should now be 1746 * up or down. Returns true if successful. It should now be
… …
1918 /* All clients need to get re-updated for the change */ 1782 /* All clients need to get re-updated for the change */
1919 update_all_map_los (m); 1783 update_all_map_los (m);
1920 return 1; 1784 return 1;
1921} 1785}
1922 1786
1923
1924/* 1787/*
1925 * This function updates various attributes about a specific space 1788 * This function updates various attributes about a specific space
1926 * on the map (what it looks like, whether it blocks magic, 1789 * on the map (what it looks like, whether it blocks magic,
1927 * has a living creatures, prevents people from passing 1790 * has a living creatures, prevents people from passing
1928 * through, etc) 1791 * through, etc)
1929 */ 1792 */
1930void 1793void
1931update_position (maptile *m, int x, int y) 1794mapspace::update_ ()
1932{ 1795{
1933 object *tmp, *last = NULL; 1796 object *tmp, *last = 0;
1934 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1797 uint8 flags = 0, light = 0, anywhere = 0;
1935 New_Face *top, *floor, *middle; 1798 New_Face *top, *floor, *middle;
1936 object *top_obj, *floor_obj, *middle_obj; 1799 object *top_obj, *floor_obj, *middle_obj;
1937 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1800 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1938 1801
1939 oldflags = GET_MAP_FLAGS (m, x, y);
1940 if (!(oldflags & P_NEED_UPDATE))
1941 {
1942 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1943 return;
1944 }
1945
1946 middle = blank_face; 1802 middle = blank_face;
1947 top = blank_face; 1803 top = blank_face;
1948 floor = blank_face; 1804 floor = blank_face;
1949 1805
1950 middle_obj = NULL; 1806 middle_obj = 0;
1951 top_obj = NULL; 1807 top_obj = 0;
1952 floor_obj = NULL; 1808 floor_obj = 0;
1953 1809
1954 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1810 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1955 { 1811 {
1956
1957 /* This could be made additive I guess (two lights better than 1812 /* This could be made additive I guess (two lights better than
1958 * one). But if so, it shouldn't be a simple additive - 2 1813 * one). But if so, it shouldn't be a simple additive - 2
1959 * light bulbs do not illuminate twice as far as once since 1814 * light bulbs do not illuminate twice as far as once since
1960 * it is a disapation factor that is squared (or is it cubed?) 1815 * it is a dissapation factor that is cubed.
1961 */ 1816 */
1962 if (tmp->glow_radius > light) 1817 if (tmp->glow_radius > light)
1963 light = tmp->glow_radius; 1818 light = tmp->glow_radius;
1964 1819
1965 /* This call is needed in order to update objects the player 1820 /* This call is needed in order to update objects the player
… …
2003 { 1858 {
2004 middle = tmp->face; 1859 middle = tmp->face;
2005 middle_obj = tmp; 1860 middle_obj = tmp;
2006 } 1861 }
2007 } 1862 }
1863
2008 if (tmp == tmp->above) 1864 if (tmp == tmp->above)
2009 { 1865 {
2010 LOG (llevError, "Error in structure of map\n"); 1866 LOG (llevError, "Error in structure of map\n");
2011 exit (-1); 1867 exit (-1);
2012 } 1868 }
2013 1869
2014 move_slow |= tmp->move_slow; 1870 move_slow |= tmp->move_slow;
2015 move_block |= tmp->move_block; 1871 move_block |= tmp->move_block;
2016 move_on |= tmp->move_on; 1872 move_on |= tmp->move_on;
2017 move_off |= tmp->move_off; 1873 move_off |= tmp->move_off;
2018 move_allow |= tmp->move_allow; 1874 move_allow |= tmp->move_allow;
2019 1875
2020 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2021 flags |= P_IS_ALIVE;
2022 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
2023 flags |= P_NO_MAGIC;
2024 if (QUERY_FLAG (tmp, FLAG_DAMNED))
2025 flags |= P_NO_CLERIC;
2026 if (tmp->type == SAFE_GROUND)
2027 flags |= P_SAFE;
2028
2029 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1876 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2030 flags |= P_BLOCKSVIEW; 1877 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2031 } /* for stack of objects */ 1878 if (tmp->type == PLAYER) flags |= P_PLAYER;
2032 1879 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2033 /* we don't want to rely on this function to have accurate flags, but 1880 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
2034 * since we're already doing the work, we calculate them here. 1881 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
2035 * if they don't match, logic is broken someplace.
2036 */
2037 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2038 { 1882 }
2039 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1883
2040 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1884 this->light = light;
2041 } 1885 this->flags_ = flags;
2042 SET_MAP_FLAGS (m, x, y, flags); 1886 this->move_block = move_block & ~move_allow;
2043 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1887 this->move_on = move_on;
2044 SET_MAP_MOVE_ON (m, x, y, move_on); 1888 this->move_off = move_off;
2045 SET_MAP_MOVE_OFF (m, x, y, move_off); 1889 this->move_slow = move_slow;
2046 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2047 1890
2048 /* At this point, we have a floor face (if there is a floor), 1891 /* At this point, we have a floor face (if there is a floor),
2049 * and the floor is set - we are not going to touch it at 1892 * and the floor is set - we are not going to touch it at
2050 * this point. 1893 * this point.
2051 * middle contains the highest visibility face. 1894 * middle contains the highest visibility face.
… …
2105 break; 1948 break;
2106 } 1949 }
2107 } 1950 }
2108 } 1951 }
2109 } 1952 }
1953
2110 if (middle == floor) 1954 if (middle == floor)
2111 middle = blank_face; 1955 middle = blank_face;
1956
2112 if (top == middle) 1957 if (top == middle)
2113 middle = blank_face; 1958 middle = blank_face;
2114 SET_MAP_FACE (m, x, y, top, 0);
2115 if (top != blank_face)
2116 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2117 else
2118 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2119 SET_MAP_FACE (m, x, y, middle, 1);
2120 if (middle != blank_face)
2121 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2122 else
2123 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2124 SET_MAP_FACE (m, x, y, floor, 2);
2125 if (floor != blank_face)
2126 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2127 else
2128 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2129 SET_MAP_LIGHT (m, x, y, light);
2130}
2131 1959
1960 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1961 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1962 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1963}
2132 1964
2133void 1965void
2134set_map_reset_time (maptile *map) 1966set_map_reset_time (maptile *map)
2135{ 1967{
2136 int timeout; 1968 int timeout = map->reset_timeout;
2137 1969
2138 timeout = MAP_RESET_TIMEOUT (map);
2139 if (timeout <= 0) 1970 if (timeout <= 0)
2140 timeout = MAP_DEFAULTRESET; 1971 timeout = MAP_DEFAULTRESET;
2141 if (timeout >= MAP_MAXRESET) 1972 if (timeout >= MAP_MAXRESET)
2142 timeout = MAP_MAXRESET; 1973 timeout = MAP_MAXRESET;
2143 MAP_WHEN_RESET (map) = seconds () + timeout; 1974
1975 map->reset_time = time (0) + timeout;
2144} 1976}
2145 1977
2146/* this updates the orig_map->tile_map[tile_num] value after loading 1978/* this updates the orig_map->tile_map[tile_num] value after loading
2147 * the map. It also takes care of linking back the freshly loaded 1979 * the map. It also takes care of linking back the freshly loaded
2148 * maps tile_map values if it tiles back to this one. It returns 1980 * maps tile_map values if it tiles back to this one. It returns
… …
2176 * 2008 *
2177 */ 2009 */
2178int 2010int
2179out_of_map (maptile *m, int x, int y) 2011out_of_map (maptile *m, int x, int y)
2180{ 2012{
2181
2182 /* If we get passed a null map, this is obviously the 2013 /* If we get passed a null map, this is obviously the
2183 * case. This generally shouldn't happen, but if the 2014 * case. This generally shouldn't happen, but if the
2184 * map loads fail below, it could happen. 2015 * map loads fail below, it could happen.
2185 */ 2016 */
2186 if (!m) 2017 if (!m)
… …
2188 2019
2189 if (x < 0) 2020 if (x < 0)
2190 { 2021 {
2191 if (!m->tile_path[3]) 2022 if (!m->tile_path[3])
2192 return 1; 2023 return 1;
2024
2193 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2025 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2194 {
2195 load_and_link_tiled_map (m, 3); 2026 load_and_link_tiled_map (m, 3);
2196 } 2027
2197 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2028 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2198 } 2029 }
2199 if (x >= MAP_WIDTH (m)) 2030
2031 if (x >= m->width)
2200 { 2032 {
2201 if (!m->tile_path[1]) 2033 if (!m->tile_path[1])
2202 return 1; 2034 return 1;
2035
2203 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2036 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2204 {
2205 load_and_link_tiled_map (m, 1); 2037 load_and_link_tiled_map (m, 1);
2206 } 2038
2207 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2039 return (out_of_map (m->tile_map[1], x - m->width, y));
2208 } 2040 }
2041
2209 if (y < 0) 2042 if (y < 0)
2210 { 2043 {
2211 if (!m->tile_path[0]) 2044 if (!m->tile_path[0])
2212 return 1; 2045 return 1;
2046
2213 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2047 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2214 {
2215 load_and_link_tiled_map (m, 0); 2048 load_and_link_tiled_map (m, 0);
2216 } 2049
2217 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2050 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2218 } 2051 }
2219 if (y >= MAP_HEIGHT (m)) 2052
2053 if (y >= m->height)
2220 { 2054 {
2221 if (!m->tile_path[2]) 2055 if (!m->tile_path[2])
2222 return 1; 2056 return 1;
2057
2223 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2058 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2224 {
2225 load_and_link_tiled_map (m, 2); 2059 load_and_link_tiled_map (m, 2);
2226 } 2060
2227 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2061 return (out_of_map (m->tile_map[2], x, y - m->height));
2228 } 2062 }
2229 2063
2230 /* Simple case - coordinates are within this local 2064 /* Simple case - coordinates are within this local
2231 * map. 2065 * map.
2232 */ 2066 */
… …
2246{ 2080{
2247 2081
2248 if (*x < 0) 2082 if (*x < 0)
2249 { 2083 {
2250 if (!m->tile_path[3]) 2084 if (!m->tile_path[3])
2251 return NULL; 2085 return 0;
2252 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2086 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2253 load_and_link_tiled_map (m, 3); 2087 load_and_link_tiled_map (m, 3);
2254 2088
2255 *x += MAP_WIDTH (m->tile_map[3]); 2089 *x += m->tile_map[3]->width;
2256 return (get_map_from_coord (m->tile_map[3], x, y)); 2090 return (get_map_from_coord (m->tile_map[3], x, y));
2257 } 2091 }
2258 if (*x >= MAP_WIDTH (m)) 2092
2093 if (*x >= m->width)
2259 { 2094 {
2260 if (!m->tile_path[1]) 2095 if (!m->tile_path[1])
2261 return NULL; 2096 return 0;
2097
2262 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2098 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2263 load_and_link_tiled_map (m, 1); 2099 load_and_link_tiled_map (m, 1);
2264 2100
2265 *x -= MAP_WIDTH (m); 2101 *x -= m->width;
2266 return (get_map_from_coord (m->tile_map[1], x, y)); 2102 return (get_map_from_coord (m->tile_map[1], x, y));
2267 } 2103 }
2104
2268 if (*y < 0) 2105 if (*y < 0)
2269 { 2106 {
2270 if (!m->tile_path[0]) 2107 if (!m->tile_path[0])
2271 return NULL; 2108 return 0;
2109
2272 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2110 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2273 load_and_link_tiled_map (m, 0); 2111 load_and_link_tiled_map (m, 0);
2274 2112
2275 *y += MAP_HEIGHT (m->tile_map[0]); 2113 *y += m->tile_map[0]->height;
2276 return (get_map_from_coord (m->tile_map[0], x, y)); 2114 return (get_map_from_coord (m->tile_map[0], x, y));
2277 } 2115 }
2278 if (*y >= MAP_HEIGHT (m)) 2116
2117 if (*y >= m->height)
2279 { 2118 {
2280 if (!m->tile_path[2]) 2119 if (!m->tile_path[2])
2281 return NULL; 2120 return 0;
2121
2282 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2122 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2283 load_and_link_tiled_map (m, 2); 2123 load_and_link_tiled_map (m, 2);
2284 2124
2285 *y -= MAP_HEIGHT (m); 2125 *y -= m->height;
2286 return (get_map_from_coord (m->tile_map[2], x, y)); 2126 return (get_map_from_coord (m->tile_map[2], x, y));
2287 } 2127 }
2288 2128
2289 /* Simple case - coordinates are within this local 2129 /* Simple case - coordinates are within this local
2290 * map. 2130 * map.
… …
2310 2150
2311 } 2151 }
2312 else if (map1->tile_map[0] == map2) 2152 else if (map1->tile_map[0] == map2)
2313 { /* up */ 2153 { /* up */
2314 *dx = 0; 2154 *dx = 0;
2315 *dy = -MAP_HEIGHT (map2); 2155 *dy = -map2->height;
2316 } 2156 }
2317 else if (map1->tile_map[1] == map2) 2157 else if (map1->tile_map[1] == map2)
2318 { /* right */ 2158 { /* right */
2319 *dx = MAP_WIDTH (map1); 2159 *dx = map1->width;
2320 *dy = 0; 2160 *dy = 0;
2321 } 2161 }
2322 else if (map1->tile_map[2] == map2) 2162 else if (map1->tile_map[2] == map2)
2323 { /* down */ 2163 { /* down */
2324 *dx = 0; 2164 *dx = 0;
2325 *dy = MAP_HEIGHT (map1); 2165 *dy = map1->height;
2326 } 2166 }
2327 else if (map1->tile_map[3] == map2) 2167 else if (map1->tile_map[3] == map2)
2328 { /* left */ 2168 { /* left */
2329 *dx = -MAP_WIDTH (map2); 2169 *dx = -map2->width;
2330 *dy = 0; 2170 *dy = 0;
2331 2171
2332 } 2172 }
2333 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 2173 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2334 { /* up right */ 2174 { /* up right */
2335 *dx = MAP_WIDTH (map1->tile_map[0]); 2175 *dx = map1->tile_map[0]->width;
2336 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2176 *dy = -map1->tile_map[0]->height;
2337 } 2177 }
2338 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 2178 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2339 { /* up left */ 2179 { /* up left */
2340 *dx = -MAP_WIDTH (map2); 2180 *dx = -map2->width;
2341 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2181 *dy = -map1->tile_map[0]->height;
2342 } 2182 }
2343 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 2183 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2344 { /* right up */ 2184 { /* right up */
2345 *dx = MAP_WIDTH (map1); 2185 *dx = map1->width;
2346 *dy = -MAP_HEIGHT (map2); 2186 *dy = -map2->height;
2347 } 2187 }
2348 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 2188 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2349 { /* right down */ 2189 { /* right down */
2350 *dx = MAP_WIDTH (map1); 2190 *dx = map1->width;
2351 *dy = MAP_HEIGHT (map1->tile_map[1]); 2191 *dy = map1->tile_map[1]->height;
2352 } 2192 }
2353 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 2193 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2354 { /* down right */ 2194 { /* down right */
2355 *dx = MAP_WIDTH (map1->tile_map[2]); 2195 *dx = map1->tile_map[2]->width;
2356 *dy = MAP_HEIGHT (map1); 2196 *dy = map1->height;
2357 } 2197 }
2358 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 2198 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2359 { /* down left */ 2199 { /* down left */
2360 *dx = -MAP_WIDTH (map2); 2200 *dx = -map2->width;
2361 *dy = MAP_HEIGHT (map1); 2201 *dy = map1->height;
2362 } 2202 }
2363 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 2203 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2364 { /* left up */ 2204 { /* left up */
2365 *dx = -MAP_WIDTH (map1->tile_map[3]); 2205 *dx = -map1->tile_map[3]->width;
2366 *dy = -MAP_HEIGHT (map2); 2206 *dy = -map2->height;
2367 } 2207 }
2368 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 2208 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2369 { /* left down */ 2209 { /* left down */
2370 *dx = -MAP_WIDTH (map1->tile_map[3]); 2210 *dx = -map1->tile_map[3]->width;
2371 *dy = MAP_HEIGHT (map1->tile_map[3]); 2211 *dy = map1->tile_map[3]->height;
2372 2212
2373 } 2213 }
2374 else 2214 else
2375 { /* not "adjacent" enough */ 2215 { /* not "adjacent" enough */
2376 return 0; 2216 return 0;
… …
2501{ 2341{
2502 int dx, dy; 2342 int dx, dy;
2503 2343
2504 return adjacent_map (op1->map, op2->map, &dx, &dy); 2344 return adjacent_map (op1->map, op2->map, &dx, &dy);
2505} 2345}
2346
2347object *
2348maptile::insert (object *op, int x, int y, object *originator, int flags)
2349{
2350 if (!op->flag [FLAG_REMOVED])
2351 op->remove ();
2352
2353 return insert_ob_in_map_at (op, this, originator, flags, x, y);
2354}
2355

Diff Legend

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