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.41 by root, Tue Dec 12 22:37:05 2006 UTC vs.
Revision 1.49 by root, Mon Dec 25 14:54:44 2006 UTC

… …
28#include <loader.h> 28#include <loader.h>
29#include <unistd.h> 29#include <unistd.h>
30 30
31#include "path.h" 31#include "path.h"
32 32
33
34/* 33/*
35 * Returns the maptile which has a name matching the given argument. 34 * Returns the maptile which has a name matching the given argument.
36 * return NULL if no match is found. 35 * return NULL if no match is found.
37 */ 36 */
38
39maptile * 37maptile *
40has_been_loaded (const char *name) 38has_been_loaded (const char *name)
41{ 39{
42 maptile *map; 40 maptile *map;
43 41
44 if (!name || !*name) 42 if (!name || !*name)
45 return 0; 43 return 0;
44
46 for (map = first_map; map; map = map->next) 45 for (map = first_map; map; map = map->next)
47 if (!strcmp (name, map->path)) 46 if (!strcmp (name, map->path))
48 break; 47 break;
48
49 return (map); 49 return (map);
50} 50}
51 51
52/* 52/*
53 * This makes a path absolute outside the world of Crossfire. 53 * This makes a path absolute outside the world of Crossfire.
… …
197 197
198void 198void
199dump_map (const maptile *m) 199dump_map (const maptile *m)
200{ 200{
201 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); 201 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
202 LOG (llevError, "Size: %dx%d Start: %d,%d\n", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m)); 202 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y);
203 203
204 if (m->msg != NULL) 204 if (m->msg != NULL)
205 LOG (llevError, "Message:\n%s", m->msg); 205 LOG (llevError, "Message:\n%s", m->msg);
206 206
207 if (m->maplore != NULL) 207 if (m->maplore != NULL)
… …
223void 223void
224dump_all_maps (void) 224dump_all_maps (void)
225{ 225{
226 maptile *m; 226 maptile *m;
227 227
228 for (m = first_map; m != NULL; m = m->next) 228 for (m = first_map; m; m = m->next)
229 {
230 dump_map (m); 229 dump_map (m);
231 }
232} 230}
233 231
234/* This rolls up wall, blocks_magic, blocks_view, etc, all into 232/* This rolls up wall, blocks_magic, blocks_view, etc, all into
235 * one function that just returns a P_.. value (see map.h) 233 * one function that just returns a P_.. value (see map.h)
236 * it will also do map translation for tiled maps, returning 234 * it will also do map translation for tiled maps, returning
… …
240 * is needed. The case of not passing values is if we're just 238 * is needed. The case of not passing values is if we're just
241 * checking for the existence of something on those spaces, but 239 * checking for the existence of something on those spaces, but
242 * don't expect to insert/remove anything from those spaces. 240 * don't expect to insert/remove anything from those spaces.
243 */ 241 */
244int 242int
245get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) 243get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
246{ 244{
247 sint16 newx, newy; 245 sint16 newx, newy;
248 int retval = 0; 246 int retval = 0;
249 maptile *mp; 247 maptile *mp;
250 248
251 if (out_of_map (oldmap, x, y))
252 return P_OUT_OF_MAP;
253 newx = x; 249 newx = x;
254 newy = y; 250 newy = y;
251
255 mp = get_map_from_coord (oldmap, &newx, &newy); 252 mp = get_map_from_coord (oldmap, &newx, &newy);
253
254 if (!mp)
255 return P_OUT_OF_MAP;
256
256 if (mp != oldmap) 257 if (mp != oldmap)
257 retval |= P_NEW_MAP; 258 retval |= P_NEW_MAP;
258 if (newmap)
259 *newmap = mp;
260 if (nx)
261 *nx = newx;
262 if (ny)
263 *ny = newy;
264 259
265 retval |= mp->spaces[newx + mp->width * newy].flags; 260 if (newmap) *newmap = mp;
261 if (nx) *nx = newx;
262 if (ny) *ny = newy;
266 263
267 return retval; 264 return retval | mp->at (newx, newy).flags ();
268} 265}
269 266
270/* 267/*
271 * Returns true if the given coordinate is blocked except by the 268 * Returns true if the given coordinate is blocked except by the
272 * object passed is not blocking. This is used with 269 * object passed is not blocking. This is used with
… …
295 } 292 }
296 293
297 /* Save some cycles - instead of calling get_map_flags(), just get the value 294 /* Save some cycles - instead of calling get_map_flags(), just get the value
298 * directly. 295 * directly.
299 */ 296 */
300 mflags = m->spaces[sx + m->width * sy].flags; 297 mflags = m->at (sx, sy).flags ();
301 298
302 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 299 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
303 300
304 /* If space is currently not blocked by anything, no need to 301 /* If space is currently not blocked by anything, no need to
305 * go further. Not true for players - all sorts of special 302 * go further. Not true for players - all sorts of special
… …
324 /* We basically go through the stack of objects, and if there is 321 /* We basically go through the stack of objects, and if there is
325 * some other object that has NO_PASS or FLAG_ALIVE set, return 322 * some other object that has NO_PASS or FLAG_ALIVE set, return
326 * true. If we get through the entire stack, that must mean 323 * true. If we get through the entire stack, that must mean
327 * ob is blocking it, so return 0. 324 * ob is blocking it, so return 0.
328 */ 325 */
329 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) 326 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
330 { 327 {
331 328
332 /* This must be before the checks below. Code for inventory checkers. */ 329 /* This must be before the checks below. Code for inventory checkers. */
333 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 330 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
334 { 331 {
… …
398 * 395 *
399 * Note this used to be arch_blocked, but with new movement 396 * Note this used to be arch_blocked, but with new movement
400 * code, we need to have actual object to check its move_type 397 * code, we need to have actual object to check its move_type
401 * against the move_block values. 398 * against the move_block values.
402 */ 399 */
403
404int 400int
405ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 401ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
406{ 402{
407 archetype *tmp; 403 archetype *tmp;
408 int flag; 404 int flag;
… …
414 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 410 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
415 if (flag & P_OUT_OF_MAP) 411 if (flag & P_OUT_OF_MAP)
416 return P_OUT_OF_MAP; 412 return P_OUT_OF_MAP;
417 413
418 /* don't have object, so don't know what types would block */ 414 /* don't have object, so don't know what types would block */
419 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 415 return m1->at (sx, sy).move_block;
420 } 416 }
421 417
422 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 418 for (tmp = ob->arch; tmp; tmp = tmp->more)
423 { 419 {
424 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 420 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
425 421
426 if (flag & P_OUT_OF_MAP) 422 if (flag & P_OUT_OF_MAP)
427 return P_OUT_OF_MAP; 423 return P_OUT_OF_MAP;
428 if (flag & P_IS_ALIVE) 424 if (flag & P_IS_ALIVE)
429 return P_IS_ALIVE; 425 return P_IS_ALIVE;
430 426
427 mapspace &ms = m1->at (sx, sy);
428
429
431 /* find_first_free_spot() calls this function. However, often 430 /* find_first_free_spot() calls this function. However, often
432 * ob doesn't have any move type (when used to place exits) 431 * ob doesn't have any move type (when used to place exits)
433 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 432 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
434 */ 433 */
435 434
436 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) 435 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
437 continue; 436 continue;
438 437
439 /* Note it is intentional that we check ob - the movement type of the 438 /* Note it is intentional that we check ob - the movement type of the
440 * head of the object should correspond for the entire object. 439 * head of the object should correspond for the entire object.
441 */ 440 */
442 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 441 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
443 return AB_NO_PASS; 442 return P_NO_PASS;
444
445 } 443 }
444
446 return 0; 445 return 0;
447} 446}
448 447
449/* When the map is loaded, load_object does not actually insert objects 448/* When the map is loaded, load_object does not actually insert objects
450 * into inventory, but just links them. What this does is go through 449 * into inventory, but just links them. What this does is go through
… …
485{ 484{
486 int x, y; 485 int x, y;
487 object *tmp, *op, *last, *above; 486 object *tmp, *op, *last, *above;
488 archetype *at; 487 archetype *at;
489 488
490 for (x = 0; x < MAP_WIDTH (m); x++) 489 for (x = 0; x < m->width; x++)
491 for (y = 0; y < MAP_HEIGHT (m); y++) 490 for (y = 0; y < m->height; y++)
492 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) 491 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
493 { 492 {
494 above = tmp->above; 493 above = tmp->above;
495 494
496 /* already multipart - don't do anything more */ 495 /* already multipart - don't do anything more */
497 if (tmp->head || tmp->more) 496 if (tmp->head || tmp->more)
… …
547 { 546 {
548 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 547 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
549 continue; 548 continue;
550 } 549 }
551 550
552
553 switch (i) 551 switch (i)
554 { 552 {
555 case LL_NORMAL: 553 case LL_NORMAL:
556 /* if we are loading an overlay, put the floors on the bottom */ 554 /* if we are loading an overlay, put the floors on the bottom */
557 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) 555 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
… …
582 { 580 {
583 for (j = 0; j < m->height; j++) 581 for (j = 0; j < m->height; j++)
584 { 582 {
585 unique = 0; 583 unique = 0;
586 /* check for unique items, or unique squares */ 584 /* check for unique items, or unique squares */
587 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 585 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
588 { 586 {
589 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 587 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
590 unique = 1; 588 unique = 1;
591 589
592 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 590 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
… …
609{ 607{
610 int i, j = 0, unique = 0; 608 int i, j = 0, unique = 0;
611 object *op; 609 object *op;
612 610
613 /* first pass - save one-part objects */ 611 /* first pass - save one-part objects */
614 for (i = 0; i < MAP_WIDTH (m); i++) 612 for (i = 0; i < m->width; i++)
615 for (j = 0; j < MAP_HEIGHT (m); j++) 613 for (j = 0; j < m->height; j++)
616 { 614 {
617 unique = 0; 615 unique = 0;
618 for (op = get_map_ob (m, i, j); op; op = op->above) 616 for (op = m->at (i, j).bot; op; op = op->above)
619 { 617 {
620 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 618 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
621 unique = 1; 619 unique = 1;
622 620
623 if (op->type == PLAYER) 621 if (op->type == PLAYER)
624 {
625 LOG (llevDebug, "Player on map that is being saved\n");
626 continue; 622 continue;
627 }
628 623
629 if (op->head || op->owner) 624 if (op->head || op->owner)
630 continue; 625 continue;
631 626
632 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 627 if (unique || op->flag [FLAG_UNIQUE])
633 save_object (fp2, op, 3); 628 save_object (fp2, op, 3);
634 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 629 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
635 save_object (fp, op, 3); 630 save_object (fp, op, 3);
636 631 }
637 } /* for this space */ 632 }
638 } /* for this j */
639} 633}
640 634
641maptile::maptile () 635maptile::maptile ()
642{ 636{
643 in_memory = MAP_SWAPPED; 637 in_memory = MAP_SWAPPED;
644 /* The maps used to pick up default x and y values from the 638 /* The maps used to pick up default x and y values from the
645 * map archetype. Mimic that behaviour. 639 * map archetype. Mimic that behaviour.
646 */ 640 */
647 MAP_WIDTH (this) = 16; 641 this->width = 16;
648 MAP_HEIGHT (this) = 16; 642 this->height = 16;
649 MAP_RESET_TIMEOUT (this) = 0; 643 this->reset_timeout = 0;
650 MAP_TIMEOUT (this) = 300; 644 this->timeout = 300;
651 MAP_ENTER_X (this) = 0; 645 this->enter_x = 0;
652 MAP_ENTER_Y (this) = 0; 646 this->enter_y = 0;
653 /*set part to -1 indicating conversion to weather map not yet done */ 647 /*set part to -1 indicating conversion to weather map not yet done */
654 MAP_WORLDPARTX (this) = -1; 648 this->worldpartx = -1;
655 MAP_WORLDPARTY (this) = -1; 649 this->worldparty = -1;
656} 650}
657 651
658/* 652/*
659 * Allocates, initialises, and returns a pointer to a maptile. 653 * Allocates, initialises, and returns a pointer to a maptile.
660 * Modified to no longer take a path option which was not being 654 * Modified to no longer take a path option which was not being
… …
693 { 687 {
694 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); 688 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
695 free (spaces); 689 free (spaces);
696 } 690 }
697 691
698 spaces = (MapSpace *) 692 spaces = (mapspace *)
699 calloc (1, width * height * sizeof (MapSpace)); 693 calloc (1, width * height * sizeof (mapspace));
700 694
701 if (!spaces) 695 if (!spaces)
702 fatal (OUT_OF_MEMORY); 696 fatal (OUT_OF_MEMORY);
703} 697}
704 698
… …
730 char *shop_string, *p, *q, *next_semicolon, *next_colon; 724 char *shop_string, *p, *q, *next_semicolon, *next_colon;
731 shopitems *items = NULL; 725 shopitems *items = NULL;
732 int i = 0, number_of_entries = 0; 726 int i = 0, number_of_entries = 0;
733 const typedata *current_type; 727 const typedata *current_type;
734 728
735 shop_string = strdup_local (input_string); 729 shop_string = strdup (input_string);
736 p = shop_string; 730 p = shop_string;
737 /* first we'll count the entries, we'll need that for allocating the array shortly */ 731 /* first we'll count the entries, we'll need that for allocating the array shortly */
738 while (p) 732 while (p)
739 { 733 {
740 p = strchr (p, ';'); 734 p = strchr (p, ';');
… …
926 * with nothing between). There is no reason in those cases to 920 * with nothing between). There is no reason in those cases to
927 * keep the empty message. Also, msgbuf contains garbage data 921 * keep the empty message. Also, msgbuf contains garbage data
928 * when msgpos is zero, so copying it results in crashes 922 * when msgpos is zero, so copying it results in crashes
929 */ 923 */
930 if (msgpos != 0) 924 if (msgpos != 0)
931 m->msg = strdup_local (msgbuf); 925 m->msg = strdup (msgbuf);
932 } 926 }
933 else if (!strcmp (key, "maplore")) 927 else if (!strcmp (key, "maplore"))
934 { 928 {
935 while (fgets (buf, HUGE_BUF, fp) != NULL) 929 while (fgets (buf, HUGE_BUF, fp) != NULL)
936 { 930 {
… …
942 strcpy (maplorebuf + maplorepos, buf); 936 strcpy (maplorebuf + maplorepos, buf);
943 maplorepos += strlen (buf); 937 maplorepos += strlen (buf);
944 } 938 }
945 } 939 }
946 if (maplorepos != 0) 940 if (maplorepos != 0)
947 m->maplore = strdup_local (maplorebuf); 941 m->maplore = strdup (maplorebuf);
948 } 942 }
949 else if (!strcmp (key, "end")) 943 else if (!strcmp (key, "end"))
950 { 944 {
951 break; 945 break;
952 } 946 }
… …
961 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); 955 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
962 } 956 }
963 else if (!strcmp (key, "name")) 957 else if (!strcmp (key, "name"))
964 { 958 {
965 *end = 0; 959 *end = 0;
966 m->name = strdup_local (value); 960 m->name = strdup (value);
967 } 961 }
968 /* first strcmp value on these are old names supported 962 /* first strcmp value on these are old names supported
969 * for compatibility reasons. The new values (second) are 963 * for compatibility reasons. The new values (second) are
970 * what really should be used. 964 * what really should be used.
971 */ 965 */
… …
1009 else if (!strcmp (key, "shopmax")) 1003 else if (!strcmp (key, "shopmax"))
1010 m->shopmax = atol (value); 1004 m->shopmax = atol (value);
1011 else if (!strcmp (key, "shoprace")) 1005 else if (!strcmp (key, "shoprace"))
1012 { 1006 {
1013 *end = 0; 1007 *end = 0;
1014 m->shoprace = strdup_local (value); 1008 m->shoprace = strdup (value);
1015 } 1009 }
1016 else if (!strcmp (key, "outdoor")) 1010 else if (!strcmp (key, "outdoor"))
1017 m->outdoor = atoi (value); 1011 m->outdoor = atoi (value);
1018 else if (!strcmp (key, "temp")) 1012 else if (!strcmp (key, "temp"))
1019 m->temp = atoi (value); 1013 m->temp = atoi (value);
… …
1069 } 1063 }
1070 1064
1071 if (editor) 1065 if (editor)
1072 { 1066 {
1073 /* Use the value as in the file. */ 1067 /* Use the value as in the file. */
1074 m->tile_path[tile - 1] = strdup_local (value); 1068 m->tile_path[tile - 1] = strdup (value);
1075 } 1069 }
1076 else if (path != NULL) 1070 else if (path != NULL)
1077 { 1071 {
1078 /* Use the normalized value. */ 1072 /* Use the normalized value. */
1079 m->tile_path[tile - 1] = strdup_local (path); 1073 m->tile_path[tile - 1] = strdup (path);
1080 } 1074 }
1081 } /* end if tile direction (in)valid */ 1075 } /* end if tile direction (in)valid */
1082 } 1076 }
1083 else 1077 else
1084 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); 1078 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
… …
1130 strcpy (m->path, filename); 1124 strcpy (m->path, filename);
1131 if (load_map_header (thawer, m)) 1125 if (load_map_header (thawer, m))
1132 { 1126 {
1133 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1127 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1134 delete_map (m); 1128 delete_map (m);
1135 return NULL; 1129 return 0;
1136 } 1130 }
1137 1131
1138 m->allocate (); 1132 m->allocate ();
1139 1133
1140 m->in_memory = MAP_LOADING; 1134 m->in_memory = MAP_LOADING;
1141 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1135 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1142 1136
1143 m->in_memory = MAP_IN_MEMORY; 1137 m->in_memory = MAP_IN_MEMORY;
1144 if (!MAP_DIFFICULTY (m)) 1138 if (!m->difficulty)
1145 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1139 m->difficulty = calculate_difficulty (m);
1146 set_map_reset_time (m); 1140 set_map_reset_time (m);
1147 m->instantiate (); 1141 m->instantiate ();
1148 return (m); 1142 return (m);
1149} 1143}
1150 1144
… …
1223 if (load_map_header (thawer, m)) 1217 if (load_map_header (thawer, m))
1224 { 1218 {
1225 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1219 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1226 delete_map (m); 1220 delete_map (m);
1227 m = load_original_map (m->path, 0); 1221 m = load_original_map (m->path, 0);
1228 return NULL; 1222 return 0;
1229 } 1223 }
1230 /*m->allocate ();*/ 1224 /*m->allocate ();*/
1231 1225
1232 m->in_memory = MAP_LOADING; 1226 m->in_memory = MAP_LOADING;
1233 load_objects (m, thawer, MAP_OVERLAY); 1227 load_objects (m, thawer, MAP_OVERLAY);
… …
1245delete_unique_items (maptile *m) 1239delete_unique_items (maptile *m)
1246{ 1240{
1247 int i, j, unique; 1241 int i, j, unique;
1248 object *op, *next; 1242 object *op, *next;
1249 1243
1250 for (i = 0; i < MAP_WIDTH (m); i++) 1244 for (i = 0; i < m->width; i++)
1251 for (j = 0; j < MAP_HEIGHT (m); j++) 1245 for (j = 0; j < m->height; j++)
1252 { 1246 {
1253 unique = 0; 1247 unique = 0;
1254 1248
1255 for (op = get_map_ob (m, i, j); op; op = next) 1249 for (op = GET_MAP_OB (m, i, j); op; op = next)
1256 { 1250 {
1257 next = op->above; 1251 next = op->above;
1258 1252
1259 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1253 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1260 unique = 1; 1254 unique = 1;
1261 1255
1262 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1256 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1263 { 1257 {
1264 clean_object (op); 1258 op->destroy_inv (false);
1265
1266 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1267 remove_button_link (op);
1268
1269 op->destroy (); 1259 op->destroy ();
1270 } 1260 }
1271 } 1261 }
1272 } 1262 }
1273} 1263}
… …
1343 make_path_to_file (filename); 1333 make_path_to_file (filename);
1344 } 1334 }
1345 else 1335 else
1346 { 1336 {
1347 if (!m->tmpname) 1337 if (!m->tmpname)
1348 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1338 m->tmpname = tempnam (settings.tmpdir, NULL);
1349 1339
1350 strcpy (filename, m->tmpname); 1340 strcpy (filename, m->tmpname);
1351 } 1341 }
1352 1342
1353 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1343 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1455 freezer.save (filename); 1445 freezer.save (filename);
1456 1446
1457 return 0; 1447 return 0;
1458} 1448}
1459 1449
1460
1461/*
1462 * Remove and free all objects in the inventory of the given object.
1463 * object.c ?
1464 */
1465
1466void
1467clean_object (object *op)
1468{
1469 object *tmp, *next;
1470
1471 for (tmp = op->inv; tmp; tmp = next)
1472 {
1473 next = tmp->below;
1474
1475 clean_object (tmp);
1476 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1477 remove_button_link (tmp);
1478
1479 tmp->destroy ();
1480 }
1481}
1482
1483/* 1450/*
1484 * Remove and free all objects in the given map. 1451 * Remove and free all objects in the given map.
1485 */ 1452 */
1486
1487void 1453void
1488free_all_objects (maptile *m) 1454free_all_objects (maptile *m)
1489{ 1455{
1490 int i, j; 1456 if (!m->spaces)
1491 object *op; 1457 return;
1492 1458
1493 for (i = 0; i < MAP_WIDTH (m); i++) 1459 for (int i = 0; i < m->width; i++)
1494 for (j = 0; j < MAP_HEIGHT (m); j++) 1460 for (int j = 0; j < m->height; j++)
1495 { 1461 {
1496 object *previous_obj = NULL; 1462 mapspace &ms = m->at (i, j);
1497 1463
1498 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1464 while (object *op = ms.bot)
1499 { 1465 {
1500 if (op == previous_obj)
1501 {
1502 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1503 break;
1504 }
1505
1506 previous_obj = op;
1507
1508 if (op->head != NULL) 1466 if (op->head)
1509 op = op->head; 1467 op = op->head;
1510 1468
1511 /* If the map isn't in memory, free_object will remove and 1469 op->destroy_inv (false);
1512 * free objects in op's inventory. So let it do the job.
1513 */
1514 if (m->in_memory == MAP_IN_MEMORY)
1515 clean_object (op);
1516
1517 op->destroy (); 1470 op->destroy ();
1518 } 1471 }
1519 } 1472 }
1520} 1473}
1521 1474
1522/* 1475/*
1523 * Frees everything allocated by the given maptileure. 1476 * Frees everything allocated by the given maptileure.
1524 * don't free tmpname - our caller is left to do that 1477 * don't free tmpname - our caller is left to do that
1525 */ 1478 */
1526
1527void 1479void
1528free_map (maptile *m, int flag) 1480free_map (maptile *m, int flag)
1529{ 1481{
1530 int i; 1482 if (m->in_memory != MAP_IN_MEMORY)
1531
1532 if (!m->in_memory)
1533 {
1534 LOG (llevError, "Trying to free freed map.\n");
1535 return; 1483 return;
1536 } 1484
1485 m->in_memory = MAP_SAVING;
1486
1487 // TODO: use new/delete
1488#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1489
1537 if (flag && m->spaces) 1490 if (flag && m->spaces)
1538 free_all_objects (m); 1491 free_all_objects (m);
1539 if (m->name) 1492 if (m->name)
1540 FREE_AND_CLEAR (m->name); 1493 FREE_AND_CLEAR (m->name);
1541 if (m->spaces) 1494 if (m->spaces)
1542 FREE_AND_CLEAR (m->spaces); 1495 FREE_AND_CLEAR (m->spaces);
1543 if (m->msg) 1496 if (m->msg)
1544 FREE_AND_CLEAR (m->msg); 1497 FREE_AND_CLEAR (m->msg);
1545 if (m->maplore) 1498 if (m->maplore)
1546 FREE_AND_CLEAR (m->maplore); 1499 FREE_AND_CLEAR (m->maplore);
1547 if (m->shopitems) 1500
1548 delete[]m->shopitems; 1501 delete [] m->shopitems;
1549 m->shopitems = 0; 1502 m->shopitems = 0;
1503
1550 if (m->shoprace) 1504 if (m->shoprace)
1551 FREE_AND_CLEAR (m->shoprace); 1505 FREE_AND_CLEAR (m->shoprace);
1506
1552 if (m->buttons) 1507 if (m->buttons)
1553 free_objectlinkpt (m->buttons); 1508 free_objectlinkpt (m->buttons);
1509
1554 m->buttons = NULL; 1510 m->buttons = NULL;
1511
1555 for (i = 0; i < 4; i++) 1512 for (int i = 0; i < 4; i++)
1556 { 1513 {
1557 if (m->tile_path[i]) 1514 if (m->tile_path[i])
1558 FREE_AND_CLEAR (m->tile_path[i]); 1515 FREE_AND_CLEAR (m->tile_path[i]);
1516
1559 m->tile_map[i] = NULL; 1517 m->tile_map[i] = 0;
1560 } 1518 }
1519
1561 m->in_memory = MAP_SWAPPED; 1520 m->in_memory = MAP_SWAPPED;
1562}
1563 1521
1564/* 1522#undef FREE_AND_CLEAR
1565 * function: vanish maptile 1523}
1566 * m : pointer to maptile, if NULL no action 1524
1567 * this deletes all the data on the map (freeing pointers) 1525maptile::~maptile ()
1568 * and then removes this map from the global linked list of maps. 1526{
1527 free_map (this, 1);
1528 free (tmpname);
1529}
1530
1531void
1532maptile::do_destroy ()
1533{
1534 attachable::do_destroy ();
1535
1536 free_all_objects (this);
1537
1538 /* We need to look through all the maps and see if any maps
1539 * are pointing at this one for tiling information. Since
1540 * tiling can be asymetric, we just can not look to see which
1541 * maps this map tiles with and clears those.
1569 */ 1542 */
1543 //TODO: non-euclidean-tiling MUST GO
1544 for (maptile *m = first_map; m; m = m->next)
1545 for (int i = 0; i < 4; i++)
1546 if (m->tile_map[i] == this)
1547 m->tile_map[i] = 0;
1570 1548
1549 if (first_map == this)
1550 first_map = next;
1551 else
1552 for (maptile *m = first_map; m; m = m->next)
1553 if (m->next = this)
1554 {
1555 m->next = next;
1556 break;
1557 }
1558}
1559
1560//TODO: must go
1571void 1561void
1572delete_map (maptile *m) 1562delete_map (maptile *m)
1573{ 1563{
1574 maptile *tmp, *last;
1575 int i;
1576
1577 if (!m) 1564 if (m)
1578 return; 1565 m->destroy ();
1579
1580 m->clear ();
1581
1582 if (m->in_memory == MAP_IN_MEMORY)
1583 {
1584 /* change to MAP_SAVING, even though we are not,
1585 * so that remove_ob doesn't do as much work.
1586 */
1587 m->in_memory = MAP_SAVING;
1588 free_map (m, 1);
1589 }
1590 /* move this out of free_map, since tmpname can still be needed if
1591 * the map is swapped out.
1592 */
1593 if (m->tmpname)
1594 {
1595 free (m->tmpname);
1596 m->tmpname = NULL;
1597 }
1598 last = NULL;
1599 /* We need to look through all the maps and see if any maps
1600 * are pointing at this one for tiling information. Since
1601 * tiling can be assymetric, we just can not look to see which
1602 * maps this map tiles with and clears those.
1603 */
1604 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1605 {
1606 if (tmp->next == m)
1607 last = tmp;
1608
1609 /* This should hopefully get unrolled on a decent compiler */
1610 for (i = 0; i < 4; i++)
1611 if (tmp->tile_map[i] == m)
1612 tmp->tile_map[i] = NULL;
1613 }
1614
1615 /* If last is null, then this should be the first map in the list */
1616 if (!last)
1617 {
1618 if (m == first_map)
1619 first_map = m->next;
1620 else
1621 /* m->path is a static char, so should hopefully still have
1622 * some useful data in it.
1623 */
1624 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1625 }
1626 else
1627 last->next = m->next;
1628
1629 delete m;
1630} 1566}
1631
1632
1633 1567
1634/* 1568/*
1635 * Makes sure the given map is loaded and swapped in. 1569 * Makes sure the given map is loaded and swapped in.
1636 * name is path name of the map. 1570 * name is path name of the map.
1637 * flags meaning: 1571 * flags meaning:
… …
1640 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. 1574 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1641 * dont do any more name translation on it. 1575 * dont do any more name translation on it.
1642 * 1576 *
1643 * Returns a pointer to the given map. 1577 * Returns a pointer to the given map.
1644 */ 1578 */
1645
1646maptile * 1579maptile *
1647ready_map_name (const char *name, int flags) 1580ready_map_name (const char *name, int flags)
1648{ 1581{
1649 maptile *m;
1650
1651 if (!name) 1582 if (!name)
1652 return (NULL); 1583 return 0;
1653 1584
1654 /* Have we been at this level before? */ 1585 /* Have we been at this level before? */
1655 m = has_been_loaded (name); 1586 maptile *m = has_been_loaded (name);
1656 1587
1657 /* Map is good to go, so just return it */ 1588 /* Map is good to go, so just return it */
1658 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) 1589 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1659 {
1660 return m; 1590 return m;
1661 }
1662 1591
1663 /* unique maps always get loaded from their original location, and never 1592 /* unique maps always get loaded from their original location, and never
1664 * a temp location. Likewise, if map_flush is set, or we have never loaded 1593 * a temp location. Likewise, if map_flush is set, or we have never loaded
1665 * this map, load it now. I removed the reset checking from here - 1594 * this map, load it now. I removed the reset checking from here -
1666 * it seems the probability of a player trying to enter a map that should 1595 * it seems the probability of a player trying to enter a map that should
… …
1668 * a bit cleaner (and players probably shouldn't rely on exact timing for 1597 * a bit cleaner (and players probably shouldn't rely on exact timing for
1669 * resets in any case - if they really care, they should use the 'maps command. 1598 * resets in any case - if they really care, they should use the 'maps command.
1670 */ 1599 */
1671 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1600 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1672 { 1601 {
1673
1674 /* first visit or time to reset */ 1602 /* first visit or time to reset */
1675 if (m) 1603 if (m)
1676 { 1604 {
1677 clean_tmp_map (m); /* Doesn't make much difference */ 1605 clean_tmp_map (m); /* Doesn't make much difference */
1678 delete_map (m); 1606 delete_map (m);
… …
1765 int x, y, i; 1693 int x, y, i;
1766 long monster_cnt = 0; 1694 long monster_cnt = 0;
1767 double avgexp = 0; 1695 double avgexp = 0;
1768 sint64 total_exp = 0; 1696 sint64 total_exp = 0;
1769 1697
1770 if (MAP_DIFFICULTY (m)) 1698 if (m->difficulty)
1771 { 1699 {
1772 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1700 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1773 return MAP_DIFFICULTY (m); 1701 return m->difficulty;
1774 } 1702 }
1775 1703
1776 for (x = 0; x < MAP_WIDTH (m); x++) 1704 for (x = 0; x < m->width; x++)
1777 for (y = 0; y < MAP_HEIGHT (m); y++) 1705 for (y = 0; y < m->height; y++)
1778 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 1706 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1779 { 1707 {
1780 if (QUERY_FLAG (op, FLAG_MONSTER)) 1708 if (QUERY_FLAG (op, FLAG_MONSTER))
1781 { 1709 {
1782 total_exp += op->stats.exp; 1710 total_exp += op->stats.exp;
1783 monster_cnt++; 1711 monster_cnt++;
… …
1876 /* All clients need to get re-updated for the change */ 1804 /* All clients need to get re-updated for the change */
1877 update_all_map_los (m); 1805 update_all_map_los (m);
1878 return 1; 1806 return 1;
1879} 1807}
1880 1808
1881
1882/* 1809/*
1883 * This function updates various attributes about a specific space 1810 * This function updates various attributes about a specific space
1884 * on the map (what it looks like, whether it blocks magic, 1811 * on the map (what it looks like, whether it blocks magic,
1885 * has a living creatures, prevents people from passing 1812 * has a living creatures, prevents people from passing
1886 * through, etc) 1813 * through, etc)
1887 */ 1814 */
1888void 1815void
1889update_position (maptile *m, int x, int y) 1816mapspace::update_ ()
1890{ 1817{
1891 object *tmp, *last = NULL; 1818 object *tmp, *last = 0;
1892 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1819 uint8 flags = 0, light = 0, anywhere = 0;
1893 New_Face *top, *floor, *middle; 1820 New_Face *top, *floor, *middle;
1894 object *top_obj, *floor_obj, *middle_obj; 1821 object *top_obj, *floor_obj, *middle_obj;
1895 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1822 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1896 1823
1897 oldflags = GET_MAP_FLAGS (m, x, y);
1898 if (!(oldflags & P_NEED_UPDATE))
1899 {
1900 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1901 return;
1902 }
1903
1904 middle = blank_face; 1824 middle = blank_face;
1905 top = blank_face; 1825 top = blank_face;
1906 floor = blank_face; 1826 floor = blank_face;
1907 1827
1908 middle_obj = NULL; 1828 middle_obj = 0;
1909 top_obj = NULL; 1829 top_obj = 0;
1910 floor_obj = NULL; 1830 floor_obj = 0;
1911 1831
1912 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1832 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1913 { 1833 {
1914
1915 /* This could be made additive I guess (two lights better than 1834 /* This could be made additive I guess (two lights better than
1916 * one). But if so, it shouldn't be a simple additive - 2 1835 * one). But if so, it shouldn't be a simple additive - 2
1917 * light bulbs do not illuminate twice as far as once since 1836 * light bulbs do not illuminate twice as far as once since
1918 * it is a disapation factor that is squared (or is it cubed?) 1837 * it is a dissapation factor that is cubed.
1919 */ 1838 */
1920 if (tmp->glow_radius > light) 1839 if (tmp->glow_radius > light)
1921 light = tmp->glow_radius; 1840 light = tmp->glow_radius;
1922 1841
1923 /* This call is needed in order to update objects the player 1842 /* This call is needed in order to update objects the player
… …
1961 { 1880 {
1962 middle = tmp->face; 1881 middle = tmp->face;
1963 middle_obj = tmp; 1882 middle_obj = tmp;
1964 } 1883 }
1965 } 1884 }
1885
1966 if (tmp == tmp->above) 1886 if (tmp == tmp->above)
1967 { 1887 {
1968 LOG (llevError, "Error in structure of map\n"); 1888 LOG (llevError, "Error in structure of map\n");
1969 exit (-1); 1889 exit (-1);
1970 } 1890 }
1971 1891
1972 move_slow |= tmp->move_slow; 1892 move_slow |= tmp->move_slow;
1973 move_block |= tmp->move_block; 1893 move_block |= tmp->move_block;
1974 move_on |= tmp->move_on; 1894 move_on |= tmp->move_on;
1975 move_off |= tmp->move_off; 1895 move_off |= tmp->move_off;
1976 move_allow |= tmp->move_allow; 1896 move_allow |= tmp->move_allow;
1977 1897
1978 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1979 flags |= P_IS_ALIVE;
1980 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
1981 flags |= P_NO_MAGIC;
1982 if (QUERY_FLAG (tmp, FLAG_DAMNED))
1983 flags |= P_NO_CLERIC;
1984 if (tmp->type == SAFE_GROUND)
1985 flags |= P_SAFE;
1986
1987 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1898 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
1988 flags |= P_BLOCKSVIEW; 1899 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
1989 } /* for stack of objects */ 1900 if (tmp->type == PLAYER) flags |= P_PLAYER;
1990 1901 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1991 /* we don't want to rely on this function to have accurate flags, but 1902 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1992 * since we're already doing the work, we calculate them here. 1903 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1993 * if they don't match, logic is broken someplace.
1994 */
1995 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
1996 { 1904 }
1997 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1905
1998 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1906 this->light = light;
1999 } 1907 this->flags_ = flags;
2000 SET_MAP_FLAGS (m, x, y, flags); 1908 this->move_block = move_block & ~move_allow;
2001 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1909 this->move_on = move_on;
2002 SET_MAP_MOVE_ON (m, x, y, move_on); 1910 this->move_off = move_off;
2003 SET_MAP_MOVE_OFF (m, x, y, move_off); 1911 this->move_slow = move_slow;
2004 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2005 1912
2006 /* At this point, we have a floor face (if there is a floor), 1913 /* At this point, we have a floor face (if there is a floor),
2007 * and the floor is set - we are not going to touch it at 1914 * and the floor is set - we are not going to touch it at
2008 * this point. 1915 * this point.
2009 * middle contains the highest visibility face. 1916 * middle contains the highest visibility face.
… …
2063 break; 1970 break;
2064 } 1971 }
2065 } 1972 }
2066 } 1973 }
2067 } 1974 }
1975
2068 if (middle == floor) 1976 if (middle == floor)
2069 middle = blank_face; 1977 middle = blank_face;
1978
2070 if (top == middle) 1979 if (top == middle)
2071 middle = blank_face; 1980 middle = blank_face;
2072 SET_MAP_FACE (m, x, y, top, 0);
2073 if (top != blank_face)
2074 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2075 else
2076 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2077 SET_MAP_FACE (m, x, y, middle, 1);
2078 if (middle != blank_face)
2079 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2080 else
2081 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2082 SET_MAP_FACE (m, x, y, floor, 2);
2083 if (floor != blank_face)
2084 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2085 else
2086 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2087 SET_MAP_LIGHT (m, x, y, light);
2088}
2089 1981
1982 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1983 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1984 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1985}
2090 1986
2091void 1987void
2092set_map_reset_time (maptile *map) 1988set_map_reset_time (maptile *map)
2093{ 1989{
2094 int timeout; 1990 int timeout;
2095 1991
2096 timeout = MAP_RESET_TIMEOUT (map); 1992 timeout = map->reset_timeout;
2097 if (timeout <= 0) 1993 if (timeout <= 0)
2098 timeout = MAP_DEFAULTRESET; 1994 timeout = MAP_DEFAULTRESET;
2099 if (timeout >= MAP_MAXRESET) 1995 if (timeout >= MAP_MAXRESET)
2100 timeout = MAP_MAXRESET; 1996 timeout = MAP_MAXRESET;
2101 MAP_WHEN_RESET (map) = seconds () + timeout; 1997 map->reset_time = time (0) + timeout;
2102} 1998}
2103 1999
2104/* this updates the orig_map->tile_map[tile_num] value after loading 2000/* this updates the orig_map->tile_map[tile_num] value after loading
2105 * the map. It also takes care of linking back the freshly loaded 2001 * the map. It also takes care of linking back the freshly loaded
2106 * maps tile_map values if it tiles back to this one. It returns 2002 * maps tile_map values if it tiles back to this one. It returns
… …
2134 * 2030 *
2135 */ 2031 */
2136int 2032int
2137out_of_map (maptile *m, int x, int y) 2033out_of_map (maptile *m, int x, int y)
2138{ 2034{
2139
2140 /* If we get passed a null map, this is obviously the 2035 /* If we get passed a null map, this is obviously the
2141 * case. This generally shouldn't happen, but if the 2036 * case. This generally shouldn't happen, but if the
2142 * map loads fail below, it could happen. 2037 * map loads fail below, it could happen.
2143 */ 2038 */
2144 if (!m) 2039 if (!m)
… …
2146 2041
2147 if (x < 0) 2042 if (x < 0)
2148 { 2043 {
2149 if (!m->tile_path[3]) 2044 if (!m->tile_path[3])
2150 return 1; 2045 return 1;
2046
2151 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2047 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2152 {
2153 load_and_link_tiled_map (m, 3); 2048 load_and_link_tiled_map (m, 3);
2154 } 2049
2155 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2050 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2156 } 2051 }
2157 if (x >= MAP_WIDTH (m)) 2052
2053 if (x >= m->width)
2158 { 2054 {
2159 if (!m->tile_path[1]) 2055 if (!m->tile_path[1])
2160 return 1; 2056 return 1;
2057
2161 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2058 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2162 {
2163 load_and_link_tiled_map (m, 1); 2059 load_and_link_tiled_map (m, 1);
2164 } 2060
2165 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2061 return (out_of_map (m->tile_map[1], x - m->width, y));
2166 } 2062 }
2063
2167 if (y < 0) 2064 if (y < 0)
2168 { 2065 {
2169 if (!m->tile_path[0]) 2066 if (!m->tile_path[0])
2170 return 1; 2067 return 1;
2068
2171 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2069 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2172 {
2173 load_and_link_tiled_map (m, 0); 2070 load_and_link_tiled_map (m, 0);
2174 } 2071
2175 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2072 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2176 } 2073 }
2177 if (y >= MAP_HEIGHT (m)) 2074
2075 if (y >= m->height)
2178 { 2076 {
2179 if (!m->tile_path[2]) 2077 if (!m->tile_path[2])
2180 return 1; 2078 return 1;
2079
2181 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2080 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2182 {
2183 load_and_link_tiled_map (m, 2); 2081 load_and_link_tiled_map (m, 2);
2184 } 2082
2185 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2083 return (out_of_map (m->tile_map[2], x, y - m->height));
2186 } 2084 }
2187 2085
2188 /* Simple case - coordinates are within this local 2086 /* Simple case - coordinates are within this local
2189 * map. 2087 * map.
2190 */ 2088 */
… …
2204{ 2102{
2205 2103
2206 if (*x < 0) 2104 if (*x < 0)
2207 { 2105 {
2208 if (!m->tile_path[3]) 2106 if (!m->tile_path[3])
2209 return NULL; 2107 return 0;
2210 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2108 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2211 load_and_link_tiled_map (m, 3); 2109 load_and_link_tiled_map (m, 3);
2212 2110
2213 *x += MAP_WIDTH (m->tile_map[3]); 2111 *x += m->tile_map[3]->width;
2214 return (get_map_from_coord (m->tile_map[3], x, y)); 2112 return (get_map_from_coord (m->tile_map[3], x, y));
2215 } 2113 }
2216 if (*x >= MAP_WIDTH (m)) 2114
2115 if (*x >= m->width)
2217 { 2116 {
2218 if (!m->tile_path[1]) 2117 if (!m->tile_path[1])
2219 return NULL; 2118 return 0;
2119
2220 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2120 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2221 load_and_link_tiled_map (m, 1); 2121 load_and_link_tiled_map (m, 1);
2222 2122
2223 *x -= MAP_WIDTH (m); 2123 *x -= m->width;
2224 return (get_map_from_coord (m->tile_map[1], x, y)); 2124 return (get_map_from_coord (m->tile_map[1], x, y));
2225 } 2125 }
2126
2226 if (*y < 0) 2127 if (*y < 0)
2227 { 2128 {
2228 if (!m->tile_path[0]) 2129 if (!m->tile_path[0])
2229 return NULL; 2130 return 0;
2131
2230 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2132 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2231 load_and_link_tiled_map (m, 0); 2133 load_and_link_tiled_map (m, 0);
2232 2134
2233 *y += MAP_HEIGHT (m->tile_map[0]); 2135 *y += m->tile_map[0]->height;
2234 return (get_map_from_coord (m->tile_map[0], x, y)); 2136 return (get_map_from_coord (m->tile_map[0], x, y));
2235 } 2137 }
2236 if (*y >= MAP_HEIGHT (m)) 2138
2139 if (*y >= m->height)
2237 { 2140 {
2238 if (!m->tile_path[2]) 2141 if (!m->tile_path[2])
2239 return NULL; 2142 return 0;
2143
2240 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2144 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2241 load_and_link_tiled_map (m, 2); 2145 load_and_link_tiled_map (m, 2);
2242 2146
2243 *y -= MAP_HEIGHT (m); 2147 *y -= m->height;
2244 return (get_map_from_coord (m->tile_map[2], x, y)); 2148 return (get_map_from_coord (m->tile_map[2], x, y));
2245 } 2149 }
2246 2150
2247 /* Simple case - coordinates are within this local 2151 /* Simple case - coordinates are within this local
2248 * map. 2152 * map.
… …
2268 2172
2269 } 2173 }
2270 else if (map1->tile_map[0] == map2) 2174 else if (map1->tile_map[0] == map2)
2271 { /* up */ 2175 { /* up */
2272 *dx = 0; 2176 *dx = 0;
2273 *dy = -MAP_HEIGHT (map2); 2177 *dy = -map2->height;
2274 } 2178 }
2275 else if (map1->tile_map[1] == map2) 2179 else if (map1->tile_map[1] == map2)
2276 { /* right */ 2180 { /* right */
2277 *dx = MAP_WIDTH (map1); 2181 *dx = map1->width;
2278 *dy = 0; 2182 *dy = 0;
2279 } 2183 }
2280 else if (map1->tile_map[2] == map2) 2184 else if (map1->tile_map[2] == map2)
2281 { /* down */ 2185 { /* down */
2282 *dx = 0; 2186 *dx = 0;
2283 *dy = MAP_HEIGHT (map1); 2187 *dy = map1->height;
2284 } 2188 }
2285 else if (map1->tile_map[3] == map2) 2189 else if (map1->tile_map[3] == map2)
2286 { /* left */ 2190 { /* left */
2287 *dx = -MAP_WIDTH (map2); 2191 *dx = -map2->width;
2288 *dy = 0; 2192 *dy = 0;
2289 2193
2290 } 2194 }
2291 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 2195 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2292 { /* up right */ 2196 { /* up right */
2293 *dx = MAP_WIDTH (map1->tile_map[0]); 2197 *dx = map1->tile_map[0]->width;
2294 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2198 *dy = -map1->tile_map[0]->height;
2295 } 2199 }
2296 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 2200 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2297 { /* up left */ 2201 { /* up left */
2298 *dx = -MAP_WIDTH (map2); 2202 *dx = -map2->width;
2299 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2203 *dy = -map1->tile_map[0]->height;
2300 } 2204 }
2301 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 2205 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2302 { /* right up */ 2206 { /* right up */
2303 *dx = MAP_WIDTH (map1); 2207 *dx = map1->width;
2304 *dy = -MAP_HEIGHT (map2); 2208 *dy = -map2->height;
2305 } 2209 }
2306 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 2210 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2307 { /* right down */ 2211 { /* right down */
2308 *dx = MAP_WIDTH (map1); 2212 *dx = map1->width;
2309 *dy = MAP_HEIGHT (map1->tile_map[1]); 2213 *dy = map1->tile_map[1]->height;
2310 } 2214 }
2311 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 2215 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2312 { /* down right */ 2216 { /* down right */
2313 *dx = MAP_WIDTH (map1->tile_map[2]); 2217 *dx = map1->tile_map[2]->width;
2314 *dy = MAP_HEIGHT (map1); 2218 *dy = map1->height;
2315 } 2219 }
2316 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 2220 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2317 { /* down left */ 2221 { /* down left */
2318 *dx = -MAP_WIDTH (map2); 2222 *dx = -map2->width;
2319 *dy = MAP_HEIGHT (map1); 2223 *dy = map1->height;
2320 } 2224 }
2321 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 2225 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2322 { /* left up */ 2226 { /* left up */
2323 *dx = -MAP_WIDTH (map1->tile_map[3]); 2227 *dx = -map1->tile_map[3]->width;
2324 *dy = -MAP_HEIGHT (map2); 2228 *dy = -map2->height;
2325 } 2229 }
2326 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 2230 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2327 { /* left down */ 2231 { /* left down */
2328 *dx = -MAP_WIDTH (map1->tile_map[3]); 2232 *dx = -map1->tile_map[3]->width;
2329 *dy = MAP_HEIGHT (map1->tile_map[3]); 2233 *dy = map1->tile_map[3]->height;
2330 2234
2331 } 2235 }
2332 else 2236 else
2333 { /* not "adjacent" enough */ 2237 { /* not "adjacent" enough */
2334 return 0; 2238 return 0;

Diff Legend

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