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

Diff Legend

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