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.36 by root, Mon Dec 11 02:41:25 2006 UTC vs.
Revision 1.52 by root, Tue Dec 26 20:04:09 2006 UTC

… …
24 24
25#include <global.h> 25#include <global.h>
26#include <funcpoint.h> 26#include <funcpoint.h>
27 27
28#include <loader.h> 28#include <loader.h>
29#ifndef WIN32 /* ---win32 exclude header */
30# include <unistd.h> 29#include <unistd.h>
31#endif /* win32 */
32 30
33#include "path.h" 31#include "path.h"
34
35 32
36/* 33/*
37 * Returns the maptile which has a name matching the given argument. 34 * Returns the maptile which has a name matching the given argument.
38 * return NULL if no match is found. 35 * return NULL if no match is found.
39 */ 36 */
40
41maptile * 37maptile *
42has_been_loaded (const char *name) 38has_been_loaded (const char *name)
43{ 39{
44 maptile *map; 40 maptile *map;
45 41
46 if (!name || !*name) 42 if (!name || !*name)
47 return 0; 43 return 0;
44
48 for (map = first_map; map; map = map->next) 45 for (map = first_map; map; map = map->next)
49 if (!strcmp (name, map->path)) 46 if (!strcmp (name, map->path))
50 break; 47 break;
48
51 return (map); 49 return (map);
52} 50}
53 51
54/* 52/*
55 * This makes a path absolute outside the world of Crossfire. 53 * This makes a path absolute outside the world of Crossfire.
… …
157int 155int
158check_path (const char *name, int prepend_dir) 156check_path (const char *name, int prepend_dir)
159{ 157{
160 char buf[MAX_BUF]; 158 char buf[MAX_BUF];
161 159
162#ifndef WIN32
163 char *endbuf; 160 char *endbuf;
164 struct stat statbuf; 161 struct stat statbuf;
165 int mode = 0; 162 int mode = 0;
166#endif
167 163
168 if (prepend_dir) 164 if (prepend_dir)
169 strcpy (buf, create_pathname (name)); 165 strcpy (buf, create_pathname (name));
170 else 166 else
171 strcpy (buf, name); 167 strcpy (buf, name);
172#ifdef WIN32 /* ***win32: check this sucker in windows style. */
173 return (_access (buf, 0));
174#else
175 168
176 /* old method (strchr(buf, '\0')) seemd very odd to me - 169 /* old method (strchr(buf, '\0')) seemd very odd to me -
177 * this method should be equivalant and is clearer. 170 * this method should be equivalant and is clearer.
178 * Can not use strcat because we need to cycle through 171 * Can not use strcat because we need to cycle through
179 * all the names. 172 * all the names.
… …
192 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || 185 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
193 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH)) 186 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
194 mode |= 2; 187 mode |= 2;
195 188
196 return (mode); 189 return (mode);
197#endif
198} 190}
199 191
200/* 192/*
201 * Prints out debug-information about a map. 193 * Prints out debug-information about a map.
202 * Dumping these at llevError doesn't seem right, but is 194 * Dumping these at llevError doesn't seem right, but is
… …
205 197
206void 198void
207dump_map (const maptile *m) 199dump_map (const maptile *m)
208{ 200{
209 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);
210 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);
211 203
212 if (m->msg != NULL) 204 if (m->msg != NULL)
213 LOG (llevError, "Message:\n%s", m->msg); 205 LOG (llevError, "Message:\n%s", m->msg);
214 206
215 if (m->maplore != NULL) 207 if (m->maplore != NULL)
… …
231void 223void
232dump_all_maps (void) 224dump_all_maps (void)
233{ 225{
234 maptile *m; 226 maptile *m;
235 227
236 for (m = first_map; m != NULL; m = m->next) 228 for (m = first_map; m; m = m->next)
237 {
238 dump_map (m); 229 dump_map (m);
239 }
240} 230}
241 231
242/* This rolls up wall, blocks_magic, blocks_view, etc, all into 232/* This rolls up wall, blocks_magic, blocks_view, etc, all into
243 * one function that just returns a P_.. value (see map.h) 233 * one function that just returns a P_.. value (see map.h)
244 * it will also do map translation for tiled maps, returning 234 * it will also do map translation for tiled maps, returning
… …
248 * 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
249 * checking for the existence of something on those spaces, but 239 * checking for the existence of something on those spaces, but
250 * don't expect to insert/remove anything from those spaces. 240 * don't expect to insert/remove anything from those spaces.
251 */ 241 */
252int 242int
253get_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)
254{ 244{
255 sint16 newx, newy; 245 sint16 newx, newy;
256 int retval = 0; 246 int retval = 0;
257 maptile *mp; 247 maptile *mp;
258 248
259 if (out_of_map (oldmap, x, y))
260 return P_OUT_OF_MAP;
261 newx = x; 249 newx = x;
262 newy = y; 250 newy = y;
251
263 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
264 if (mp != oldmap) 257 if (mp != oldmap)
265 retval |= P_NEW_MAP; 258 retval |= P_NEW_MAP;
266 if (newmap)
267 *newmap = mp;
268 if (nx)
269 *nx = newx;
270 if (ny)
271 *ny = newy;
272 259
273 retval |= mp->spaces[newx + mp->width * newy].flags; 260 if (newmap) *newmap = mp;
261 if (nx) *nx = newx;
262 if (ny) *ny = newy;
274 263
275 return retval; 264 return retval | mp->at (newx, newy).flags ();
276} 265}
277 266
278/* 267/*
279 * Returns true if the given coordinate is blocked except by the 268 * Returns true if the given coordinate is blocked except by the
280 * object passed is not blocking. This is used with 269 * object passed is not blocking. This is used with
… …
303 } 292 }
304 293
305 /* 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
306 * directly. 295 * directly.
307 */ 296 */
308 mflags = m->spaces[sx + m->width * sy].flags; 297 mflags = m->at (sx, sy).flags ();
309 298
310 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 299 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
311 300
312 /* If space is currently not blocked by anything, no need to 301 /* If space is currently not blocked by anything, no need to
313 * go further. Not true for players - all sorts of special 302 * go further. Not true for players - all sorts of special
… …
332 /* 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
333 * 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
334 * true. If we get through the entire stack, that must mean 323 * true. If we get through the entire stack, that must mean
335 * ob is blocking it, so return 0. 324 * ob is blocking it, so return 0.
336 */ 325 */
337 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)
338 { 327 {
339 328
340 /* This must be before the checks below. Code for inventory checkers. */ 329 /* This must be before the checks below. Code for inventory checkers. */
341 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 330 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
342 { 331 {
… …
406 * 395 *
407 * Note this used to be arch_blocked, but with new movement 396 * Note this used to be arch_blocked, but with new movement
408 * 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
409 * against the move_block values. 398 * against the move_block values.
410 */ 399 */
411
412int 400int
413ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 401ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
414{ 402{
415 archetype *tmp; 403 archetype *tmp;
416 int flag; 404 int flag;
… …
422 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 410 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
423 if (flag & P_OUT_OF_MAP) 411 if (flag & P_OUT_OF_MAP)
424 return P_OUT_OF_MAP; 412 return P_OUT_OF_MAP;
425 413
426 /* 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 */
427 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 415 return m1->at (sx, sy).move_block;
428 } 416 }
429 417
430 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 418 for (tmp = ob->arch; tmp; tmp = tmp->more)
431 { 419 {
432 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);
433 421
434 if (flag & P_OUT_OF_MAP) 422 if (flag & P_OUT_OF_MAP)
435 return P_OUT_OF_MAP; 423 return P_OUT_OF_MAP;
436 if (flag & P_IS_ALIVE) 424 if (flag & P_IS_ALIVE)
437 return P_IS_ALIVE; 425 return P_IS_ALIVE;
438 426
427 mapspace &ms = m1->at (sx, sy);
428
429
439 /* find_first_free_spot() calls this function. However, often 430 /* find_first_free_spot() calls this function. However, often
440 * 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)
441 * 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.
442 */ 433 */
443 434
444 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)
445 continue; 436 continue;
446 437
447 /* 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
448 * head of the object should correspond for the entire object. 439 * head of the object should correspond for the entire object.
449 */ 440 */
450 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 441 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
451 return AB_NO_PASS; 442 return P_NO_PASS;
452
453 } 443 }
444
454 return 0; 445 return 0;
455} 446}
456 447
457/* 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
458 * 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
… …
493{ 484{
494 int x, y; 485 int x, y;
495 object *tmp, *op, *last, *above; 486 object *tmp, *op, *last, *above;
496 archetype *at; 487 archetype *at;
497 488
498 for (x = 0; x < MAP_WIDTH (m); x++) 489 for (x = 0; x < m->width; x++)
499 for (y = 0; y < MAP_HEIGHT (m); y++) 490 for (y = 0; y < m->height; y++)
500 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)
501 { 492 {
502 above = tmp->above; 493 above = tmp->above;
503 494
504 /* already multipart - don't do anything more */ 495 /* already multipart - don't do anything more */
505 if (tmp->head || tmp->more) 496 if (tmp->head || tmp->more)
… …
540{ 531{
541 int i, j; 532 int i, j;
542 int unique; 533 int unique;
543 object *op, *prev = NULL, *last_more = NULL, *otmp; 534 object *op, *prev = NULL, *last_more = NULL, *otmp;
544 535
545 op = get_object (); 536 op = object::create ();
546 op->map = m; /* To handle buttons correctly */ 537 op->map = m; /* To handle buttons correctly */
547 538
548 while ((i = load_object (fp, op, mapflags))) 539 while ((i = load_object (fp, op, mapflags)))
549 { 540 {
550 /* if the archetype for the object is null, means that we 541 /* if the archetype for the object is null, means that we
… …
555 { 546 {
556 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)");
557 continue; 548 continue;
558 } 549 }
559 550
560
561 switch (i) 551 switch (i)
562 { 552 {
563 case LL_NORMAL: 553 case LL_NORMAL:
564 /* 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 */
565 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)
566 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);
567 else 557 else
568 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);
569 559
570 if (op->inv) 560 if (op->inv)
571 sum_weight (op); 561 sum_weight (op);
572 562
573 prev = op, last_more = op; 563 prev = op, last_more = op;
574 break; 564 break;
575 565
576 case LL_MORE: 566 case LL_MORE:
577 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);
578 op->head = prev, last_more->more = op, last_more = op; 568 op->head = prev, last_more->more = op, last_more = op;
579 break; 569 break;
580 } 570 }
581 571
582 if (mapflags & MAP_STYLE) 572 if (mapflags & MAP_STYLE)
583 remove_from_active_list (op); 573 remove_from_active_list (op);
584 574
585 op = get_object (); 575 op = object::create ();
586 op->map = m; 576 op->map = m;
587 } 577 }
588 578
589 for (i = 0; i < m->width; i++) 579 for (i = 0; i < m->width; i++)
590 { 580 {
591 for (j = 0; j < m->height; j++) 581 for (j = 0; j < m->height; j++)
592 { 582 {
593 unique = 0; 583 unique = 0;
594 /* check for unique items, or unique squares */ 584 /* check for unique items, or unique squares */
595 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)
596 { 586 {
597 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))
598 unique = 1; 588 unique = 1;
589
599 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 590 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
600 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); 591 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
601 } 592 }
602 } 593 }
603 } 594 }
604 595
605 free_object (op); 596 op->destroy ();
606 link_multipart_objects (m); 597 link_multipart_objects (m);
607} 598}
608 599
609/* 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.
610 * 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,
611 * 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
612 * in order to do map tiling properly. 603 * in order to do map tiling properly.
613 */ 604 */
614void 605void
615save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) 606save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
616{ 607{
617 int i, j = 0, unique = 0; 608 int i, j = 0, unique = 0;
618 object *op; 609 object *op;
619 610
620 /* first pass - save one-part objects */ 611 /* first pass - save one-part objects */
621 for (i = 0; i < MAP_WIDTH (m); i++) 612 for (i = 0; i < m->width; i++)
622 for (j = 0; j < MAP_HEIGHT (m); j++) 613 for (j = 0; j < m->height; j++)
623 { 614 {
624 unique = 0; 615 unique = 0;
616
625 for (op = get_map_ob (m, i, j); op; op = op->above) 617 for (op = m->at (i, j).bot; op; op = op->above)
626 { 618 {
627 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 619 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
628 unique = 1; 620 unique = 1;
629 621
630 if (op->type == PLAYER) 622 if (op->type == PLAYER)
631 {
632 LOG (llevDebug, "Player on map that is being saved\n");
633 continue; 623 continue;
634 }
635 624
636 if (op->head || op->owner) 625 if (op->head || op->owner)
637 continue; 626 continue;
638 627
639 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 628 if (unique || op->flag [FLAG_UNIQUE])
640 save_object (fp2, op, 3); 629 save_object (fp2, op, 1);
641 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])))
642 save_object (fp, op, 3); 631 save_object (fp, op, 1);
643 632 }
644 } /* for this space */ 633 }
645 } /* for this j */
646} 634}
647 635
648maptile::maptile () 636maptile::maptile ()
649{ 637{
650 in_memory = MAP_SWAPPED; 638 in_memory = MAP_SWAPPED;
651 /* 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
652 * map archetype. Mimic that behaviour. 640 * map archetype. Mimic that behaviour.
653 */ 641 */
654 MAP_WIDTH (this) = 16; 642 this->width = 16;
655 MAP_HEIGHT (this) = 16; 643 this->height = 16;
656 MAP_RESET_TIMEOUT (this) = 0; 644 this->reset_timeout = 0;
657 MAP_TIMEOUT (this) = 300; 645 this->timeout = 300;
658 MAP_ENTER_X (this) = 0; 646 this->enter_x = 0;
659 MAP_ENTER_Y (this) = 0; 647 this->enter_y = 0;
660 /*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 */
661 MAP_WORLDPARTX (this) = -1; 649 this->worldpartx = -1;
662 MAP_WORLDPARTY (this) = -1; 650 this->worldparty = -1;
663} 651}
664 652
665/* 653/*
666 * Allocates, initialises, and returns a pointer to a maptile. 654 * Allocates, initialises, and returns a pointer to a maptile.
667 * 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
… …
700 { 688 {
701 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);
702 free (spaces); 690 free (spaces);
703 } 691 }
704 692
705 spaces = (MapSpace *) 693 spaces = (mapspace *)
706 calloc (1, width * height * sizeof (MapSpace)); 694 calloc (1, width * height * sizeof (mapspace));
707 695
708 if (!spaces) 696 if (!spaces)
709 fatal (OUT_OF_MEMORY); 697 fatal (OUT_OF_MEMORY);
710} 698}
711 699
… …
737 char *shop_string, *p, *q, *next_semicolon, *next_colon; 725 char *shop_string, *p, *q, *next_semicolon, *next_colon;
738 shopitems *items = NULL; 726 shopitems *items = NULL;
739 int i = 0, number_of_entries = 0; 727 int i = 0, number_of_entries = 0;
740 const typedata *current_type; 728 const typedata *current_type;
741 729
742 shop_string = strdup_local (input_string); 730 shop_string = strdup (input_string);
743 p = shop_string; 731 p = shop_string;
744 /* 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 */
745 while (p) 733 while (p)
746 { 734 {
747 p = strchr (p, ';'); 735 p = strchr (p, ';');
… …
871 859
872 value = strchr (key, ' '); 860 value = strchr (key, ' ');
873 861
874 if (!value) 862 if (!value)
875 { 863 {
876 if (end = strchr (key, '\n')) 864 if ((end = strchr (key, '\n')))
877 *end = 0; 865 *end = 0;
878 } 866 }
879 else 867 else
880 { 868 {
881 *value = 0; 869 *value = 0;
… …
933 * with nothing between). There is no reason in those cases to 921 * with nothing between). There is no reason in those cases to
934 * keep the empty message. Also, msgbuf contains garbage data 922 * keep the empty message. Also, msgbuf contains garbage data
935 * when msgpos is zero, so copying it results in crashes 923 * when msgpos is zero, so copying it results in crashes
936 */ 924 */
937 if (msgpos != 0) 925 if (msgpos != 0)
938 m->msg = strdup_local (msgbuf); 926 m->msg = strdup (msgbuf);
939 } 927 }
940 else if (!strcmp (key, "maplore")) 928 else if (!strcmp (key, "maplore"))
941 { 929 {
942 while (fgets (buf, HUGE_BUF, fp) != NULL) 930 while (fgets (buf, HUGE_BUF, fp) != NULL)
943 { 931 {
… …
949 strcpy (maplorebuf + maplorepos, buf); 937 strcpy (maplorebuf + maplorepos, buf);
950 maplorepos += strlen (buf); 938 maplorepos += strlen (buf);
951 } 939 }
952 } 940 }
953 if (maplorepos != 0) 941 if (maplorepos != 0)
954 m->maplore = strdup_local (maplorebuf); 942 m->maplore = strdup (maplorebuf);
955 } 943 }
956 else if (!strcmp (key, "end")) 944 else if (!strcmp (key, "end"))
957 { 945 {
958 break; 946 break;
959 } 947 }
… …
968 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);
969 } 957 }
970 else if (!strcmp (key, "name")) 958 else if (!strcmp (key, "name"))
971 { 959 {
972 *end = 0; 960 *end = 0;
973 m->name = strdup_local (value); 961 m->name = strdup (value);
974 } 962 }
975 /* first strcmp value on these are old names supported 963 /* first strcmp value on these are old names supported
976 * for compatibility reasons. The new values (second) are 964 * for compatibility reasons. The new values (second) are
977 * what really should be used. 965 * what really should be used.
978 */ 966 */
979 else if (!strcmp (key, "oid")) 967 else if (!strcmp (key, "oid"))
980 {
981 fp.get (m, atoi (value)); 968 fp.get (m, atoi (value));
982 }
983 else if (!strcmp (key, "attach")) 969 else if (!strcmp (key, "attach"))
984 {
985 m->attach = value; 970 m->attach = value;
986 }
987 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) 971 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
988 {
989 m->enter_x = atoi (value); 972 m->enter_x = atoi (value);
990 }
991 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) 973 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
992 {
993 m->enter_y = atoi (value); 974 m->enter_y = atoi (value);
994 }
995 else if (!strcmp (key, "x") || !strcmp (key, "width")) 975 else if (!strcmp (key, "x") || !strcmp (key, "width"))
996 {
997 m->width = atoi (value); 976 m->width = atoi (value);
998 }
999 else if (!strcmp (key, "y") || !strcmp (key, "height")) 977 else if (!strcmp (key, "y") || !strcmp (key, "height"))
1000 {
1001 m->height = atoi (value); 978 m->height = atoi (value);
1002 }
1003 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) 979 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
1004 {
1005 m->reset_timeout = atoi (value); 980 m->reset_timeout = atoi (value);
1006 }
1007 else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) 981 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1008 {
1009 m->timeout = atoi (value); 982 m->timeout = atoi (value);
1010 }
1011 else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) 983 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1012 { 984 m->difficulty = clamp (atoi (value), 1, settings.max_level);
1013 m->difficulty = atoi (value);
1014 }
1015 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) 985 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1016 {
1017 m->darkness = atoi (value); 986 m->darkness = atoi (value);
1018 }
1019 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) 987 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1020 {
1021 m->fixed_resettime = atoi (value); 988 m->fixed_resettime = atoi (value);
1022 }
1023 else if (!strcmp (key, "unique")) 989 else if (!strcmp (key, "unique"))
1024 {
1025 m->unique = atoi (value); 990 m->unique = atoi (value);
1026 }
1027 else if (!strcmp (key, "template")) 991 else if (!strcmp (key, "template"))
1028 {
1029 m->templatemap = atoi (value); 992 m->templatemap = atoi (value);
1030 }
1031 else if (!strcmp (key, "region")) 993 else if (!strcmp (key, "region"))
1032 {
1033 m->region = get_region_by_name (value); 994 m->region = get_region_by_name (value);
1034 }
1035 else if (!strcmp (key, "shopitems")) 995 else if (!strcmp (key, "shopitems"))
1036 { 996 {
1037 *end = 0; 997 *end = 0;
1038 m->shopitems = parse_shop_string (value); 998 m->shopitems = parse_shop_string (value);
1039 } 999 }
1040 else if (!strcmp (key, "shopgreed")) 1000 else if (!strcmp (key, "shopgreed"))
1041 {
1042 m->shopgreed = atof (value); 1001 m->shopgreed = atof (value);
1043 }
1044 else if (!strcmp (key, "shopmin")) 1002 else if (!strcmp (key, "shopmin"))
1045 {
1046 m->shopmin = atol (value); 1003 m->shopmin = atol (value);
1047 }
1048 else if (!strcmp (key, "shopmax")) 1004 else if (!strcmp (key, "shopmax"))
1049 {
1050 m->shopmax = atol (value); 1005 m->shopmax = atol (value);
1051 }
1052 else if (!strcmp (key, "shoprace")) 1006 else if (!strcmp (key, "shoprace"))
1053 { 1007 {
1054 *end = 0; 1008 *end = 0;
1055 m->shoprace = strdup_local (value); 1009 m->shoprace = strdup (value);
1056 } 1010 }
1057 else if (!strcmp (key, "outdoor")) 1011 else if (!strcmp (key, "outdoor"))
1058 {
1059 m->outdoor = atoi (value); 1012 m->outdoor = atoi (value);
1060 }
1061 else if (!strcmp (key, "temp")) 1013 else if (!strcmp (key, "temp"))
1062 {
1063 m->temp = atoi (value); 1014 m->temp = atoi (value);
1064 }
1065 else if (!strcmp (key, "pressure")) 1015 else if (!strcmp (key, "pressure"))
1066 {
1067 m->pressure = atoi (value); 1016 m->pressure = atoi (value);
1068 }
1069 else if (!strcmp (key, "humid")) 1017 else if (!strcmp (key, "humid"))
1070 {
1071 m->humid = atoi (value); 1018 m->humid = atoi (value);
1072 }
1073 else if (!strcmp (key, "windspeed")) 1019 else if (!strcmp (key, "windspeed"))
1074 {
1075 m->windspeed = atoi (value); 1020 m->windspeed = atoi (value);
1076 }
1077 else if (!strcmp (key, "winddir")) 1021 else if (!strcmp (key, "winddir"))
1078 {
1079 m->winddir = atoi (value); 1022 m->winddir = atoi (value);
1080 }
1081 else if (!strcmp (key, "sky")) 1023 else if (!strcmp (key, "sky"))
1082 {
1083 m->sky = atoi (value); 1024 m->sky = atoi (value);
1084 }
1085 else if (!strcmp (key, "nosmooth")) 1025 else if (!strcmp (key, "nosmooth"))
1086 {
1087 m->nosmooth = atoi (value); 1026 m->nosmooth = atoi (value);
1088 }
1089 else if (!strncmp (key, "tile_path_", 10)) 1027 else if (!strncmp (key, "tile_path_", 10))
1090 { 1028 {
1091 int tile = atoi (key + 10); 1029 int tile = atoi (key + 10);
1092 1030
1093 if (tile < 1 || tile > 4) 1031 if (tile < 1 || tile > 4)
… …
1126 } 1064 }
1127 1065
1128 if (editor) 1066 if (editor)
1129 { 1067 {
1130 /* Use the value as in the file. */ 1068 /* Use the value as in the file. */
1131 m->tile_path[tile - 1] = strdup_local (value); 1069 m->tile_path[tile - 1] = strdup (value);
1132 } 1070 }
1133 else if (path != NULL) 1071 else if (path != NULL)
1134 { 1072 {
1135 /* Use the normalized value. */ 1073 /* Use the normalized value. */
1136 m->tile_path[tile - 1] = strdup_local (path); 1074 m->tile_path[tile - 1] = strdup (path);
1137 } 1075 }
1138 } /* end if tile direction (in)valid */ 1076 } /* end if tile direction (in)valid */
1139 } 1077 }
1140 else 1078 else
1141 {
1142 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);
1143 }
1144 } 1080 }
1081
1145 if (!key || strcmp (key, "end")) 1082 if (!key || strcmp (key, "end"))
1146 { 1083 {
1147 LOG (llevError, "Got premature eof on map header!\n"); 1084 LOG (llevError, "Got premature eof on map header!\n");
1148 return 1; 1085 return 1;
1149 } 1086 }
1087
1150 return 0; 1088 return 0;
1151} 1089}
1152 1090
1153/* 1091/*
1154 * Opens the file "filename" and reads information about the map 1092 * Opens the file "filename" and reads information about the map
… …
1187 strcpy (m->path, filename); 1125 strcpy (m->path, filename);
1188 if (load_map_header (thawer, m)) 1126 if (load_map_header (thawer, m))
1189 { 1127 {
1190 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);
1191 delete_map (m); 1129 delete_map (m);
1192 return NULL; 1130 return 0;
1193 } 1131 }
1194 1132
1195 m->allocate (); 1133 m->allocate ();
1196 1134
1197 m->in_memory = MAP_LOADING; 1135 m->in_memory = MAP_LOADING;
1198 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1136 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1199 1137
1200 m->in_memory = MAP_IN_MEMORY; 1138 m->in_memory = MAP_IN_MEMORY;
1201 if (!MAP_DIFFICULTY (m)) 1139 if (!m->difficulty)
1202 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1140 m->difficulty = calculate_difficulty (m);
1203 set_map_reset_time (m); 1141 set_map_reset_time (m);
1204 m->instantiate (); 1142 m->instantiate ();
1205 return (m); 1143 return (m);
1206} 1144}
1207 1145
… …
1280 if (load_map_header (thawer, m)) 1218 if (load_map_header (thawer, m))
1281 { 1219 {
1282 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);
1283 delete_map (m); 1221 delete_map (m);
1284 m = load_original_map (m->path, 0); 1222 m = load_original_map (m->path, 0);
1285 return NULL; 1223 return 0;
1286 } 1224 }
1287 /*m->allocate ();*/ 1225 /*m->allocate ();*/
1288 1226
1289 m->in_memory = MAP_LOADING; 1227 m->in_memory = MAP_LOADING;
1290 load_objects (m, thawer, MAP_OVERLAY); 1228 load_objects (m, thawer, MAP_OVERLAY);
… …
1302delete_unique_items (maptile *m) 1240delete_unique_items (maptile *m)
1303{ 1241{
1304 int i, j, unique; 1242 int i, j, unique;
1305 object *op, *next; 1243 object *op, *next;
1306 1244
1307 for (i = 0; i < MAP_WIDTH (m); i++) 1245 for (i = 0; i < m->width; i++)
1308 for (j = 0; j < MAP_HEIGHT (m); j++) 1246 for (j = 0; j < m->height; j++)
1309 { 1247 {
1310 unique = 0; 1248 unique = 0;
1249
1311 for (op = get_map_ob (m, i, j); op; op = next) 1250 for (op = GET_MAP_OB (m, i, j); op; op = next)
1312 { 1251 {
1313 next = op->above; 1252 next = op->above;
1253
1314 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))
1315 unique = 1; 1255 unique = 1;
1256
1316 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1257 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1317 { 1258 {
1318 clean_object (op); 1259 op->destroy_inv (false);
1319 if (QUERY_FLAG (op, FLAG_IS_LINKED)) 1260 op->destroy ();
1320 remove_button_link (op);
1321 remove_ob (op);
1322 free_object (op);
1323 } 1261 }
1324 } 1262 }
1325 } 1263 }
1326} 1264}
1327 1265
… …
1352 return; 1290 return;
1353 1291
1354 m->in_memory = MAP_LOADING; 1292 m->in_memory = MAP_LOADING;
1355 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1293 if (m->tmpname == NULL) /* if we have loaded unique items from */
1356 delete_unique_items (m); /* original map before, don't duplicate them */ 1294 delete_unique_items (m); /* original map before, don't duplicate them */
1295
1357 load_objects (m, thawer, 0); 1296 load_objects (m, thawer, 0);
1358 1297
1359 m->in_memory = MAP_IN_MEMORY; 1298 m->in_memory = MAP_IN_MEMORY;
1360} 1299}
1361
1362 1300
1363/* 1301/*
1364 * 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
1365 * file it was (originally) loaded from. Otherwise a temporary 1303 * file it was (originally) loaded from. Otherwise a temporary
1366 * filename will be genarated, and the file will be stored there. 1304 * filename will be genarated, and the file will be stored there.
1367 * The temporary filename will be stored in the maptileure. 1305 * The temporary filename will be stored in the maptileure.
1368 * 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
1369 * (this should have been updated when first loaded) 1307 * (this should have been updated when first loaded)
1370 */ 1308 */
1371
1372int 1309int
1373new_save_map (maptile *m, int flag) 1310new_save_map (maptile *m, int flag)
1374{ 1311{
1375 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1312 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1376 int i; 1313 int i;
… …
1396 make_path_to_file (filename); 1333 make_path_to_file (filename);
1397 } 1334 }
1398 else 1335 else
1399 { 1336 {
1400 if (!m->tmpname) 1337 if (!m->tmpname)
1401 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1338 m->tmpname = tempnam (settings.tmpdir, NULL);
1402 1339
1403 strcpy (filename, m->tmpname); 1340 strcpy (filename, m->tmpname);
1404 } 1341 }
1405 1342
1406 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1343 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1430 print_shop_string (m, shop); 1367 print_shop_string (m, shop);
1431 fprintf (freezer, "shopitems %s\n", shop); 1368 fprintf (freezer, "shopitems %s\n", shop);
1432 } 1369 }
1433 if (m->shopgreed) 1370 if (m->shopgreed)
1434 fprintf (freezer, "shopgreed %f\n", m->shopgreed); 1371 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1435#ifndef WIN32
1436 if (m->shopmin) 1372 if (m->shopmin)
1437 fprintf (freezer, "shopmin %llu\n", m->shopmin); 1373 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1438 if (m->shopmax) 1374 if (m->shopmax)
1439 fprintf (freezer, "shopmax %llu\n", m->shopmax); 1375 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1440#else
1441 if (m->shopmin)
1442 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1443 if (m->shopmax)
1444 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1445#endif
1446 if (m->shoprace) 1376 if (m->shoprace)
1447 fprintf (freezer, "shoprace %s\n", m->shoprace); 1377 fprintf (freezer, "shoprace %s\n", m->shoprace);
1448 if (m->darkness) 1378 if (m->darkness)
1449 fprintf (freezer, "darkness %d\n", m->darkness); 1379 fprintf (freezer, "darkness %d\n", m->darkness);
1450 if (m->width) 1380 if (m->width)
… …
1515 freezer.save (filename); 1445 freezer.save (filename);
1516 1446
1517 return 0; 1447 return 0;
1518} 1448}
1519 1449
1520
1521/*
1522 * Remove and free all objects in the inventory of the given object.
1523 * object.c ?
1524 */
1525
1526void
1527clean_object (object *op)
1528{
1529 object *tmp, *next;
1530
1531 for (tmp = op->inv; tmp; tmp = next)
1532 {
1533 next = tmp->below;
1534 clean_object (tmp);
1535 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1536 remove_button_link (tmp);
1537 remove_ob (tmp);
1538 free_object (tmp);
1539 }
1540}
1541
1542/* 1450/*
1543 * Remove and free all objects in the given map. 1451 * Remove and free all objects in the given map.
1544 */ 1452 */
1545
1546void 1453void
1547free_all_objects (maptile *m) 1454free_all_objects (maptile *m)
1548{ 1455{
1549 int i, j; 1456 if (!m->spaces)
1550 object *op; 1457 return;
1551 1458
1552 for (i = 0; i < MAP_WIDTH (m); i++) 1459 for (int i = 0; i < m->width; i++)
1553 for (j = 0; j < MAP_HEIGHT (m); j++) 1460 for (int j = 0; j < m->height; j++)
1554 { 1461 {
1555 object *previous_obj = NULL; 1462 mapspace &ms = m->at (i, j);
1556 1463
1557 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1464 while (object *op = ms.bot)
1558 { 1465 {
1559 if (op == previous_obj)
1560 {
1561 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1562 break;
1563 }
1564 previous_obj = op;
1565 if (op->head != NULL) 1466 if (op->head)
1566 op = op->head; 1467 op = op->head;
1567 1468
1568 /* If the map isn't in memory, free_object will remove and 1469 op->destroy_inv (false);
1569 * free objects in op's inventory. So let it do the job. 1470 op->destroy ();
1570 */
1571 if (m->in_memory == MAP_IN_MEMORY)
1572 clean_object (op);
1573 remove_ob (op);
1574 free_object (op);
1575 } 1471 }
1576 } 1472 }
1577} 1473}
1578 1474
1579/* 1475/*
1580 * Frees everything allocated by the given maptileure. 1476 * Frees everything allocated by the given maptileure.
1581 * don't free tmpname - our caller is left to do that 1477 * don't free tmpname - our caller is left to do that
1582 */ 1478 */
1583
1584void 1479void
1585free_map (maptile *m, int flag) 1480free_map (maptile *m, int flag)
1586{ 1481{
1587 int i; 1482 if (!m->in_memory) //TODO: makes no sense to me?
1588
1589 if (!m->in_memory)
1590 {
1591 LOG (llevError, "Trying to free freed map.\n");
1592 return; 1483 return;
1593 } 1484
1485 m->in_memory = MAP_SAVING;
1486
1487 // TODO: use new/delete
1488
1594 if (flag && m->spaces) 1489 if (flag && m->spaces)
1595 free_all_objects (m); 1490 free_all_objects (m);
1596 if (m->name) 1491
1597 FREE_AND_CLEAR (m->name); 1492 free (m->name), m->name = 0;
1598 if (m->spaces) 1493 free (m->spaces), m->spaces = 0;
1599 FREE_AND_CLEAR (m->spaces); 1494 free (m->msg), m->msg = 0;
1600 if (m->msg) 1495 free (m->maplore), m->maplore = 0;
1601 FREE_AND_CLEAR (m->msg); 1496 free (m->shoprace), m->shoprace = 0;
1602 if (m->maplore) 1497 delete [] m->shopitems, m->shopitems = 0;
1603 FREE_AND_CLEAR (m->maplore); 1498
1604 if (m->shopitems)
1605 delete[]m->shopitems;
1606 m->shopitems = 0;
1607 if (m->shoprace)
1608 FREE_AND_CLEAR (m->shoprace);
1609 if (m->buttons) 1499 if (m->buttons)
1610 free_objectlinkpt (m->buttons); 1500 free_objectlinkpt (m->buttons), m->buttons = 0;
1611 m->buttons = NULL; 1501
1612 for (i = 0; i < 4; i++) 1502 for (int i = 0; i < 4; i++)
1613 { 1503 {
1614 if (m->tile_path[i]) 1504 if (m->tile_path[i])
1615 FREE_AND_CLEAR (m->tile_path[i]); 1505 free (m->tile_path[i]), m->tile_path[i] = 0;
1506
1616 m->tile_map[i] = NULL; 1507 m->tile_map[i] = 0;
1617 } 1508 }
1509
1618 m->in_memory = MAP_SWAPPED; 1510 m->in_memory = MAP_SWAPPED;
1619} 1511}
1620 1512
1621/* 1513maptile::~maptile ()
1622 * function: vanish maptile 1514{
1623 * m : pointer to maptile, if NULL no action 1515 free_map (this, 1);
1624 * this deletes all the data on the map (freeing pointers) 1516 free (tmpname);
1625 * 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.
1626 */ 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;
1627 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
1628void 1549void
1629delete_map (maptile *m) 1550delete_map (maptile *m)
1630{ 1551{
1631 maptile *tmp, *last;
1632 int i;
1633
1634 if (!m) 1552 if (m)
1635 return; 1553 m->destroy ();
1636
1637 m->clear ();
1638
1639 if (m->in_memory == MAP_IN_MEMORY)
1640 {
1641 /* change to MAP_SAVING, even though we are not,
1642 * so that remove_ob doesn't do as much work.
1643 */
1644 m->in_memory = MAP_SAVING;
1645 free_map (m, 1);
1646 }
1647 /* move this out of free_map, since tmpname can still be needed if
1648 * the map is swapped out.
1649 */
1650 if (m->tmpname)
1651 {
1652 free (m->tmpname);
1653 m->tmpname = NULL;
1654 }
1655 last = NULL;
1656 /* We need to look through all the maps and see if any maps
1657 * are pointing at this one for tiling information. Since
1658 * tiling can be assymetric, we just can not look to see which
1659 * maps this map tiles with and clears those.
1660 */
1661 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1662 {
1663 if (tmp->next == m)
1664 last = tmp;
1665
1666 /* This should hopefully get unrolled on a decent compiler */
1667 for (i = 0; i < 4; i++)
1668 if (tmp->tile_map[i] == m)
1669 tmp->tile_map[i] = NULL;
1670 }
1671
1672 /* If last is null, then this should be the first map in the list */
1673 if (!last)
1674 {
1675 if (m == first_map)
1676 first_map = m->next;
1677 else
1678 /* m->path is a static char, so should hopefully still have
1679 * some useful data in it.
1680 */
1681 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1682 }
1683 else
1684 last->next = m->next;
1685
1686 delete m;
1687} 1554}
1688
1689
1690 1555
1691/* 1556/*
1692 * Makes sure the given map is loaded and swapped in. 1557 * Makes sure the given map is loaded and swapped in.
1693 * name is path name of the map. 1558 * name is path name of the map.
1694 * flags meaning: 1559 * flags meaning:
… …
1697 * 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.
1698 * dont do any more name translation on it. 1563 * dont do any more name translation on it.
1699 * 1564 *
1700 * Returns a pointer to the given map. 1565 * Returns a pointer to the given map.
1701 */ 1566 */
1702
1703maptile * 1567maptile *
1704ready_map_name (const char *name, int flags) 1568ready_map_name (const char *name, int flags)
1705{ 1569{
1706 maptile *m;
1707
1708 if (!name) 1570 if (!name)
1709 return (NULL); 1571 return 0;
1710 1572
1711 /* Have we been at this level before? */ 1573 /* Have we been at this level before? */
1712 m = has_been_loaded (name); 1574 maptile *m = has_been_loaded (name);
1713 1575
1714 /* Map is good to go, so just return it */ 1576 /* Map is good to go, so just return it */
1715 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))
1716 {
1717 return m; 1578 return m;
1718 }
1719 1579
1720 /* unique maps always get loaded from their original location, and never 1580 /* unique maps always get loaded from their original location, and never
1721 * 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
1722 * 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 -
1723 * 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
… …
1725 * 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
1726 * 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.
1727 */ 1587 */
1728 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1588 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1729 { 1589 {
1730
1731 /* first visit or time to reset */ 1590 /* first visit or time to reset */
1732 if (m) 1591 if (m)
1733 { 1592 {
1734 clean_tmp_map (m); /* Doesn't make much difference */ 1593 clean_tmp_map (m); /* Doesn't make much difference */
1735 delete_map (m); 1594 delete_map (m);
… …
1822 int x, y, i; 1681 int x, y, i;
1823 long monster_cnt = 0; 1682 long monster_cnt = 0;
1824 double avgexp = 0; 1683 double avgexp = 0;
1825 sint64 total_exp = 0; 1684 sint64 total_exp = 0;
1826 1685
1827 if (MAP_DIFFICULTY (m)) 1686 if (m->difficulty)
1828 { 1687 {
1829 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1688 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1830 return MAP_DIFFICULTY (m); 1689 return m->difficulty;
1831 } 1690 }
1832 1691
1833 for (x = 0; x < MAP_WIDTH (m); x++) 1692 for (x = 0; x < m->width; x++)
1834 for (y = 0; y < MAP_HEIGHT (m); y++) 1693 for (y = 0; y < m->height; y++)
1835 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)
1836 { 1695 {
1837 if (QUERY_FLAG (op, FLAG_MONSTER)) 1696 if (QUERY_FLAG (op, FLAG_MONSTER))
1838 { 1697 {
1839 total_exp += op->stats.exp; 1698 total_exp += op->stats.exp;
1840 monster_cnt++; 1699 monster_cnt++;
… …
1933 /* All clients need to get re-updated for the change */ 1792 /* All clients need to get re-updated for the change */
1934 update_all_map_los (m); 1793 update_all_map_los (m);
1935 return 1; 1794 return 1;
1936} 1795}
1937 1796
1938
1939/* 1797/*
1940 * This function updates various attributes about a specific space 1798 * This function updates various attributes about a specific space
1941 * on the map (what it looks like, whether it blocks magic, 1799 * on the map (what it looks like, whether it blocks magic,
1942 * has a living creatures, prevents people from passing 1800 * has a living creatures, prevents people from passing
1943 * through, etc) 1801 * through, etc)
1944 */ 1802 */
1945void 1803void
1946update_position (maptile *m, int x, int y) 1804mapspace::update_ ()
1947{ 1805{
1948 object *tmp, *last = NULL; 1806 object *tmp, *last = 0;
1949 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1807 uint8 flags = 0, light = 0, anywhere = 0;
1950 New_Face *top, *floor, *middle; 1808 New_Face *top, *floor, *middle;
1951 object *top_obj, *floor_obj, *middle_obj; 1809 object *top_obj, *floor_obj, *middle_obj;
1952 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;
1953 1811
1954 oldflags = GET_MAP_FLAGS (m, x, y);
1955 if (!(oldflags & P_NEED_UPDATE))
1956 {
1957 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1958 return;
1959 }
1960
1961 middle = blank_face; 1812 middle = blank_face;
1962 top = blank_face; 1813 top = blank_face;
1963 floor = blank_face; 1814 floor = blank_face;
1964 1815
1965 middle_obj = NULL; 1816 middle_obj = 0;
1966 top_obj = NULL; 1817 top_obj = 0;
1967 floor_obj = NULL; 1818 floor_obj = 0;
1968 1819
1969 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1820 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1970 { 1821 {
1971
1972 /* This could be made additive I guess (two lights better than 1822 /* This could be made additive I guess (two lights better than
1973 * 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
1974 * light bulbs do not illuminate twice as far as once since 1824 * light bulbs do not illuminate twice as far as once since
1975 * it is a disapation factor that is squared (or is it cubed?) 1825 * it is a dissapation factor that is cubed.
1976 */ 1826 */
1977 if (tmp->glow_radius > light) 1827 if (tmp->glow_radius > light)
1978 light = tmp->glow_radius; 1828 light = tmp->glow_radius;
1979 1829
1980 /* This call is needed in order to update objects the player 1830 /* This call is needed in order to update objects the player
… …
2018 { 1868 {
2019 middle = tmp->face; 1869 middle = tmp->face;
2020 middle_obj = tmp; 1870 middle_obj = tmp;
2021 } 1871 }
2022 } 1872 }
1873
2023 if (tmp == tmp->above) 1874 if (tmp == tmp->above)
2024 { 1875 {
2025 LOG (llevError, "Error in structure of map\n"); 1876 LOG (llevError, "Error in structure of map\n");
2026 exit (-1); 1877 exit (-1);
2027 } 1878 }
2028 1879
2029 move_slow |= tmp->move_slow; 1880 move_slow |= tmp->move_slow;
2030 move_block |= tmp->move_block; 1881 move_block |= tmp->move_block;
2031 move_on |= tmp->move_on; 1882 move_on |= tmp->move_on;
2032 move_off |= tmp->move_off; 1883 move_off |= tmp->move_off;
2033 move_allow |= tmp->move_allow; 1884 move_allow |= tmp->move_allow;
2034 1885
2035 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2036 flags |= P_IS_ALIVE;
2037 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
2038 flags |= P_NO_MAGIC;
2039 if (QUERY_FLAG (tmp, FLAG_DAMNED))
2040 flags |= P_NO_CLERIC;
2041 if (tmp->type == SAFE_GROUND)
2042 flags |= P_SAFE;
2043
2044 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1886 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2045 flags |= P_BLOCKSVIEW; 1887 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2046 } /* for stack of objects */ 1888 if (tmp->type == PLAYER) flags |= P_PLAYER;
2047 1889 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2048 /* 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;
2049 * since we're already doing the work, we calculate them here. 1891 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
2050 * if they don't match, logic is broken someplace.
2051 */
2052 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2053 { 1892 }
2054 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1893
2055 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1894 this->light = light;
2056 } 1895 this->flags_ = flags;
2057 SET_MAP_FLAGS (m, x, y, flags); 1896 this->move_block = move_block & ~move_allow;
2058 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1897 this->move_on = move_on;
2059 SET_MAP_MOVE_ON (m, x, y, move_on); 1898 this->move_off = move_off;
2060 SET_MAP_MOVE_OFF (m, x, y, move_off); 1899 this->move_slow = move_slow;
2061 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2062 1900
2063 /* 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),
2064 * 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
2065 * this point. 1903 * this point.
2066 * middle contains the highest visibility face. 1904 * middle contains the highest visibility face.
… …
2120 break; 1958 break;
2121 } 1959 }
2122 } 1960 }
2123 } 1961 }
2124 } 1962 }
1963
2125 if (middle == floor) 1964 if (middle == floor)
2126 middle = blank_face; 1965 middle = blank_face;
1966
2127 if (top == middle) 1967 if (top == middle)
2128 middle = blank_face; 1968 middle = blank_face;
2129 SET_MAP_FACE (m, x, y, top, 0);
2130 if (top != blank_face)
2131 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2132 else
2133 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2134 SET_MAP_FACE (m, x, y, middle, 1);
2135 if (middle != blank_face)
2136 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2137 else
2138 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2139 SET_MAP_FACE (m, x, y, floor, 2);
2140 if (floor != blank_face)
2141 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2142 else
2143 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2144 SET_MAP_LIGHT (m, x, y, light);
2145}
2146 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}
2147 1974
2148void 1975void
2149set_map_reset_time (maptile *map) 1976set_map_reset_time (maptile *map)
2150{ 1977{
2151 int timeout; 1978 int timeout;
2152 1979
2153 timeout = MAP_RESET_TIMEOUT (map); 1980 timeout = map->reset_timeout;
2154 if (timeout <= 0) 1981 if (timeout <= 0)
2155 timeout = MAP_DEFAULTRESET; 1982 timeout = MAP_DEFAULTRESET;
2156 if (timeout >= MAP_MAXRESET) 1983 if (timeout >= MAP_MAXRESET)
2157 timeout = MAP_MAXRESET; 1984 timeout = MAP_MAXRESET;
2158 MAP_WHEN_RESET (map) = seconds () + timeout; 1985 map->reset_time = time (0) + timeout;
2159} 1986}
2160 1987
2161/* 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
2162 * 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
2163 * 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
… …
2191 * 2018 *
2192 */ 2019 */
2193int 2020int
2194out_of_map (maptile *m, int x, int y) 2021out_of_map (maptile *m, int x, int y)
2195{ 2022{
2196
2197 /* If we get passed a null map, this is obviously the 2023 /* If we get passed a null map, this is obviously the
2198 * case. This generally shouldn't happen, but if the 2024 * case. This generally shouldn't happen, but if the
2199 * map loads fail below, it could happen. 2025 * map loads fail below, it could happen.
2200 */ 2026 */
2201 if (!m) 2027 if (!m)
… …
2203 2029
2204 if (x < 0) 2030 if (x < 0)
2205 { 2031 {
2206 if (!m->tile_path[3]) 2032 if (!m->tile_path[3])
2207 return 1; 2033 return 1;
2034
2208 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)
2209 {
2210 load_and_link_tiled_map (m, 3); 2036 load_and_link_tiled_map (m, 3);
2211 } 2037
2212 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));
2213 } 2039 }
2214 if (x >= MAP_WIDTH (m)) 2040
2041 if (x >= m->width)
2215 { 2042 {
2216 if (!m->tile_path[1]) 2043 if (!m->tile_path[1])
2217 return 1; 2044 return 1;
2045
2218 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)
2219 {
2220 load_and_link_tiled_map (m, 1); 2047 load_and_link_tiled_map (m, 1);
2221 } 2048
2222 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));
2223 } 2050 }
2051
2224 if (y < 0) 2052 if (y < 0)
2225 { 2053 {
2226 if (!m->tile_path[0]) 2054 if (!m->tile_path[0])
2227 return 1; 2055 return 1;
2056
2228 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)
2229 {
2230 load_and_link_tiled_map (m, 0); 2058 load_and_link_tiled_map (m, 0);
2231 } 2059
2232 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));
2233 } 2061 }
2234 if (y >= MAP_HEIGHT (m)) 2062
2063 if (y >= m->height)
2235 { 2064 {
2236 if (!m->tile_path[2]) 2065 if (!m->tile_path[2])
2237 return 1; 2066 return 1;
2067
2238 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)
2239 {
2240 load_and_link_tiled_map (m, 2); 2069 load_and_link_tiled_map (m, 2);
2241 } 2070
2242 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));
2243 } 2072 }
2244 2073
2245 /* Simple case - coordinates are within this local 2074 /* Simple case - coordinates are within this local
2246 * map. 2075 * map.
2247 */ 2076 */
… …
2261{ 2090{
2262 2091
2263 if (*x < 0) 2092 if (*x < 0)
2264 { 2093 {
2265 if (!m->tile_path[3]) 2094 if (!m->tile_path[3])
2266 return NULL; 2095 return 0;
2267 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)
2268 load_and_link_tiled_map (m, 3); 2097 load_and_link_tiled_map (m, 3);
2269 2098
2270 *x += MAP_WIDTH (m->tile_map[3]); 2099 *x += m->tile_map[3]->width;
2271 return (get_map_from_coord (m->tile_map[3], x, y)); 2100 return (get_map_from_coord (m->tile_map[3], x, y));
2272 } 2101 }
2273 if (*x >= MAP_WIDTH (m)) 2102
2103 if (*x >= m->width)
2274 { 2104 {
2275 if (!m->tile_path[1]) 2105 if (!m->tile_path[1])
2276 return NULL; 2106 return 0;
2107
2277 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)
2278 load_and_link_tiled_map (m, 1); 2109 load_and_link_tiled_map (m, 1);
2279 2110
2280 *x -= MAP_WIDTH (m); 2111 *x -= m->width;
2281 return (get_map_from_coord (m->tile_map[1], x, y)); 2112 return (get_map_from_coord (m->tile_map[1], x, y));
2282 } 2113 }
2114
2283 if (*y < 0) 2115 if (*y < 0)
2284 { 2116 {
2285 if (!m->tile_path[0]) 2117 if (!m->tile_path[0])
2286 return NULL; 2118 return 0;
2119
2287 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)
2288 load_and_link_tiled_map (m, 0); 2121 load_and_link_tiled_map (m, 0);
2289 2122
2290 *y += MAP_HEIGHT (m->tile_map[0]); 2123 *y += m->tile_map[0]->height;
2291 return (get_map_from_coord (m->tile_map[0], x, y)); 2124 return (get_map_from_coord (m->tile_map[0], x, y));
2292 } 2125 }
2293 if (*y >= MAP_HEIGHT (m)) 2126
2127 if (*y >= m->height)
2294 { 2128 {
2295 if (!m->tile_path[2]) 2129 if (!m->tile_path[2])
2296 return NULL; 2130 return 0;
2131
2297 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)
2298 load_and_link_tiled_map (m, 2); 2133 load_and_link_tiled_map (m, 2);
2299 2134
2300 *y -= MAP_HEIGHT (m); 2135 *y -= m->height;
2301 return (get_map_from_coord (m->tile_map[2], x, y)); 2136 return (get_map_from_coord (m->tile_map[2], x, y));
2302 } 2137 }
2303 2138
2304 /* Simple case - coordinates are within this local 2139 /* Simple case - coordinates are within this local
2305 * map. 2140 * map.
… …
2325 2160
2326 } 2161 }
2327 else if (map1->tile_map[0] == map2) 2162 else if (map1->tile_map[0] == map2)
2328 { /* up */ 2163 { /* up */
2329 *dx = 0; 2164 *dx = 0;
2330 *dy = -MAP_HEIGHT (map2); 2165 *dy = -map2->height;
2331 } 2166 }
2332 else if (map1->tile_map[1] == map2) 2167 else if (map1->tile_map[1] == map2)
2333 { /* right */ 2168 { /* right */
2334 *dx = MAP_WIDTH (map1); 2169 *dx = map1->width;
2335 *dy = 0; 2170 *dy = 0;
2336 } 2171 }
2337 else if (map1->tile_map[2] == map2) 2172 else if (map1->tile_map[2] == map2)
2338 { /* down */ 2173 { /* down */
2339 *dx = 0; 2174 *dx = 0;
2340 *dy = MAP_HEIGHT (map1); 2175 *dy = map1->height;
2341 } 2176 }
2342 else if (map1->tile_map[3] == map2) 2177 else if (map1->tile_map[3] == map2)
2343 { /* left */ 2178 { /* left */
2344 *dx = -MAP_WIDTH (map2); 2179 *dx = -map2->width;
2345 *dy = 0; 2180 *dy = 0;
2346 2181
2347 } 2182 }
2348 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)
2349 { /* up right */ 2184 { /* up right */
2350 *dx = MAP_WIDTH (map1->tile_map[0]); 2185 *dx = map1->tile_map[0]->width;
2351 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2186 *dy = -map1->tile_map[0]->height;
2352 } 2187 }
2353 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)
2354 { /* up left */ 2189 { /* up left */
2355 *dx = -MAP_WIDTH (map2); 2190 *dx = -map2->width;
2356 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2191 *dy = -map1->tile_map[0]->height;
2357 } 2192 }
2358 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)
2359 { /* right up */ 2194 { /* right up */
2360 *dx = MAP_WIDTH (map1); 2195 *dx = map1->width;
2361 *dy = -MAP_HEIGHT (map2); 2196 *dy = -map2->height;
2362 } 2197 }
2363 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)
2364 { /* right down */ 2199 { /* right down */
2365 *dx = MAP_WIDTH (map1); 2200 *dx = map1->width;
2366 *dy = MAP_HEIGHT (map1->tile_map[1]); 2201 *dy = map1->tile_map[1]->height;
2367 } 2202 }
2368 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)
2369 { /* down right */ 2204 { /* down right */
2370 *dx = MAP_WIDTH (map1->tile_map[2]); 2205 *dx = map1->tile_map[2]->width;
2371 *dy = MAP_HEIGHT (map1); 2206 *dy = map1->height;
2372 } 2207 }
2373 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)
2374 { /* down left */ 2209 { /* down left */
2375 *dx = -MAP_WIDTH (map2); 2210 *dx = -map2->width;
2376 *dy = MAP_HEIGHT (map1); 2211 *dy = map1->height;
2377 } 2212 }
2378 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)
2379 { /* left up */ 2214 { /* left up */
2380 *dx = -MAP_WIDTH (map1->tile_map[3]); 2215 *dx = -map1->tile_map[3]->width;
2381 *dy = -MAP_HEIGHT (map2); 2216 *dy = -map2->height;
2382 } 2217 }
2383 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)
2384 { /* left down */ 2219 { /* left down */
2385 *dx = -MAP_WIDTH (map1->tile_map[3]); 2220 *dx = -map1->tile_map[3]->width;
2386 *dy = MAP_HEIGHT (map1->tile_map[3]); 2221 *dy = map1->tile_map[3]->height;
2387 2222
2388 } 2223 }
2389 else 2224 else
2390 { /* not "adjacent" enough */ 2225 { /* not "adjacent" enough */
2391 return 0; 2226 return 0;
… …
2516{ 2351{
2517 int dx, dy; 2352 int dx, dy;
2518 2353
2519 return adjacent_map (op1->map, op2->map, &dx, &dy); 2354 return adjacent_map (op1->map, op2->map, &dx, &dy);
2520} 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