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.39 by root, Tue Dec 12 20:53:02 2006 UTC vs.
Revision 1.53 by root, Wed Dec 27 09:28:01 2006 UTC

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

Diff Legend

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