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

Diff Legend

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