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

Diff Legend

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