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.42 by root, Wed Dec 13 02:55:49 2006 UTC vs.
Revision 1.50 by root, Mon Dec 25 15:28:35 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}
… …
1299 return; 1289 return;
1300 1290
1301 m->in_memory = MAP_LOADING; 1291 m->in_memory = MAP_LOADING;
1302 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1292 if (m->tmpname == NULL) /* if we have loaded unique items from */
1303 delete_unique_items (m); /* original map before, don't duplicate them */ 1293 delete_unique_items (m); /* original map before, don't duplicate them */
1294
1304 load_objects (m, thawer, 0); 1295 load_objects (m, thawer, 0);
1305 1296
1306 m->in_memory = MAP_IN_MEMORY; 1297 m->in_memory = MAP_IN_MEMORY;
1307} 1298}
1308
1309 1299
1310/* 1300/*
1311 * Saves a map to file. If flag is set, it is saved into the same 1301 * Saves a map to file. If flag is set, it is saved into the same
1312 * file it was (originally) loaded from. Otherwise a temporary 1302 * file it was (originally) loaded from. Otherwise a temporary
1313 * filename will be genarated, and the file will be stored there. 1303 * filename will be genarated, and the file will be stored there.
1314 * The temporary filename will be stored in the maptileure. 1304 * The temporary filename will be stored in the maptileure.
1315 * If the map is unique, we also save to the filename in the map 1305 * If the map is unique, we also save to the filename in the map
1316 * (this should have been updated when first loaded) 1306 * (this should have been updated when first loaded)
1317 */ 1307 */
1318
1319int 1308int
1320new_save_map (maptile *m, int flag) 1309new_save_map (maptile *m, int flag)
1321{ 1310{
1322 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1323 int i; 1312 int i;
… …
1343 make_path_to_file (filename); 1332 make_path_to_file (filename);
1344 } 1333 }
1345 else 1334 else
1346 { 1335 {
1347 if (!m->tmpname) 1336 if (!m->tmpname)
1348 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1337 m->tmpname = tempnam (settings.tmpdir, NULL);
1349 1338
1350 strcpy (filename, m->tmpname); 1339 strcpy (filename, m->tmpname);
1351 } 1340 }
1352 1341
1353 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1342 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1455 freezer.save (filename); 1444 freezer.save (filename);
1456 1445
1457 return 0; 1446 return 0;
1458} 1447}
1459 1448
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/* 1449/*
1484 * Remove and free all objects in the given map. 1450 * Remove and free all objects in the given map.
1485 */ 1451 */
1486
1487void 1452void
1488free_all_objects (maptile *m) 1453free_all_objects (maptile *m)
1489{ 1454{
1490 int i, j; 1455 if (!m->spaces)
1491 object *op; 1456 return;
1492 1457
1493 for (i = 0; i < MAP_WIDTH (m); i++) 1458 for (int i = 0; i < m->width; i++)
1494 for (j = 0; j < MAP_HEIGHT (m); j++) 1459 for (int j = 0; j < m->height; j++)
1495 { 1460 {
1496 object *previous_obj = NULL; 1461 mapspace &ms = m->at (i, j);
1497 1462
1498 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1463 while (object *op = ms.bot)
1499 { 1464 {
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) 1465 if (op->head)
1509 op = op->head; 1466 op = op->head;
1510 1467
1511 /* If the map isn't in memory, free_object will remove and 1468 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 (); 1469 op->destroy ();
1518 } 1470 }
1519 } 1471 }
1520} 1472}
1521 1473
1522/* 1474/*
1523 * Frees everything allocated by the given maptileure. 1475 * Frees everything allocated by the given maptileure.
1524 * don't free tmpname - our caller is left to do that 1476 * don't free tmpname - our caller is left to do that
1525 */ 1477 */
1526
1527void 1478void
1528free_map (maptile *m, int flag) 1479free_map (maptile *m, int flag)
1529{ 1480{
1530 int i; 1481 if (!m->in_memory) //TODO: makes no sense to me?
1531
1532 if (!m->in_memory)
1533 {
1534 LOG (llevError, "Trying to free freed map.\n");
1535 return; 1482 return;
1536 } 1483
1484 m->in_memory = MAP_SAVING;
1537 1485
1538 // TODO: use new/delete 1486 // TODO: use new/delete
1539#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1540 1487
1541 if (flag && m->spaces) 1488 if (flag && m->spaces)
1542 free_all_objects (m); 1489 free_all_objects (m);
1543 if (m->name)
1544 FREE_AND_CLEAR (m->name);
1545 if (m->spaces)
1546 FREE_AND_CLEAR (m->spaces);
1547 if (m->msg)
1548 FREE_AND_CLEAR (m->msg);
1549 if (m->maplore)
1550 FREE_AND_CLEAR (m->maplore);
1551 1490
1552 delete [] m->shopitems; 1491 free (m->name), m->name = 0;
1553 m->shopitems = 0; 1492 free (m->spaces), m->spaces = 0;
1554 1493 free (m->msg), m->msg = 0;
1555 if (m->shoprace) 1494 free (m->maplore), m->maplore = 0;
1556 FREE_AND_CLEAR (m->shoprace); 1495 free (m->shoprace), m->shoprace = 0;
1496 delete [] m->shopitems, m->shopitems = 0;
1557 1497
1558 if (m->buttons) 1498 if (m->buttons)
1559 free_objectlinkpt (m->buttons); 1499 free_objectlinkpt (m->buttons), m->buttons = 0;
1560 1500
1561 m->buttons = NULL;
1562
1563 for (i = 0; i < 4; i++) 1501 for (int i = 0; i < 4; i++)
1564 { 1502 {
1565 if (m->tile_path[i]) 1503 if (m->tile_path[i])
1566 FREE_AND_CLEAR (m->tile_path[i]); 1504 free (m->tile_path[i]), m->tile_path[i] = 0;
1505
1567 m->tile_map[i] = NULL; 1506 m->tile_map[i] = 0;
1568 } 1507 }
1569 1508
1570 m->in_memory = MAP_SWAPPED; 1509 m->in_memory = MAP_SWAPPED;
1571
1572#undef FREE_AND_CLEAR
1573
1574} 1510}
1575 1511
1576/* 1512maptile::~maptile ()
1577 * function: vanish maptile 1513{
1578 * m : pointer to maptile, if NULL no action 1514 free_map (this, 1);
1579 * this deletes all the data on the map (freeing pointers) 1515 free (tmpname);
1580 * and then removes this map from the global linked list of maps. 1516}
1517
1518void
1519maptile::do_destroy ()
1520{
1521 attachable::do_destroy ();
1522
1523 free_all_objects (this);
1524
1525 /* We need to look through all the maps and see if any maps
1526 * are pointing at this one for tiling information. Since
1527 * tiling can be asymetric, we just can not look to see which
1528 * maps this map tiles with and clears those.
1581 */ 1529 */
1530 //TODO: non-euclidean-tiling MUST GO
1531 for (maptile *m = first_map; m; m = m->next)
1532 for (int i = 0; i < 4; i++)
1533 if (m->tile_map[i] == this)
1534 m->tile_map[i] = 0;
1582 1535
1536 if (first_map == this)
1537 first_map = next;
1538 else
1539 for (maptile *m = first_map; m; m = m->next)
1540 if (m->next = this)
1541 {
1542 m->next = next;
1543 break;
1544 }
1545}
1546
1547//TODO: must go
1583void 1548void
1584delete_map (maptile *m) 1549delete_map (maptile *m)
1585{ 1550{
1586 maptile *tmp, *last;
1587 int i;
1588
1589 if (!m) 1551 if (m)
1590 return; 1552 m->destroy ();
1591
1592 m->clear ();
1593
1594 if (m->in_memory == MAP_IN_MEMORY)
1595 {
1596 /* change to MAP_SAVING, even though we are not,
1597 * so that remove_ob doesn't do as much work.
1598 */
1599 m->in_memory = MAP_SAVING;
1600 free_map (m, 1);
1601 }
1602 /* move this out of free_map, since tmpname can still be needed if
1603 * the map is swapped out.
1604 */
1605 if (m->tmpname)
1606 {
1607 free (m->tmpname);
1608 m->tmpname = NULL;
1609 }
1610 last = NULL;
1611 /* We need to look through all the maps and see if any maps
1612 * are pointing at this one for tiling information. Since
1613 * tiling can be assymetric, we just can not look to see which
1614 * maps this map tiles with and clears those.
1615 */
1616 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1617 {
1618 if (tmp->next == m)
1619 last = tmp;
1620
1621 /* This should hopefully get unrolled on a decent compiler */
1622 for (i = 0; i < 4; i++)
1623 if (tmp->tile_map[i] == m)
1624 tmp->tile_map[i] = NULL;
1625 }
1626
1627 /* If last is null, then this should be the first map in the list */
1628 if (!last)
1629 {
1630 if (m == first_map)
1631 first_map = m->next;
1632 else
1633 /* m->path is a static char, so should hopefully still have
1634 * some useful data in it.
1635 */
1636 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1637 }
1638 else
1639 last->next = m->next;
1640
1641 delete m;
1642} 1553}
1643
1644
1645 1554
1646/* 1555/*
1647 * Makes sure the given map is loaded and swapped in. 1556 * Makes sure the given map is loaded and swapped in.
1648 * name is path name of the map. 1557 * name is path name of the map.
1649 * flags meaning: 1558 * flags meaning:
… …
1652 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. 1561 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1653 * dont do any more name translation on it. 1562 * dont do any more name translation on it.
1654 * 1563 *
1655 * Returns a pointer to the given map. 1564 * Returns a pointer to the given map.
1656 */ 1565 */
1657
1658maptile * 1566maptile *
1659ready_map_name (const char *name, int flags) 1567ready_map_name (const char *name, int flags)
1660{ 1568{
1661 maptile *m;
1662
1663 if (!name) 1569 if (!name)
1664 return (NULL); 1570 return 0;
1665 1571
1666 /* Have we been at this level before? */ 1572 /* Have we been at this level before? */
1667 m = has_been_loaded (name); 1573 maptile *m = has_been_loaded (name);
1668 1574
1669 /* Map is good to go, so just return it */ 1575 /* Map is good to go, so just return it */
1670 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) 1576 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1671 {
1672 return m; 1577 return m;
1673 }
1674 1578
1675 /* unique maps always get loaded from their original location, and never 1579 /* unique maps always get loaded from their original location, and never
1676 * a temp location. Likewise, if map_flush is set, or we have never loaded 1580 * a temp location. Likewise, if map_flush is set, or we have never loaded
1677 * this map, load it now. I removed the reset checking from here - 1581 * this map, load it now. I removed the reset checking from here -
1678 * it seems the probability of a player trying to enter a map that should 1582 * it seems the probability of a player trying to enter a map that should
… …
1680 * a bit cleaner (and players probably shouldn't rely on exact timing for 1584 * a bit cleaner (and players probably shouldn't rely on exact timing for
1681 * resets in any case - if they really care, they should use the 'maps command. 1585 * resets in any case - if they really care, they should use the 'maps command.
1682 */ 1586 */
1683 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1587 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1684 { 1588 {
1685
1686 /* first visit or time to reset */ 1589 /* first visit or time to reset */
1687 if (m) 1590 if (m)
1688 { 1591 {
1689 clean_tmp_map (m); /* Doesn't make much difference */ 1592 clean_tmp_map (m); /* Doesn't make much difference */
1690 delete_map (m); 1593 delete_map (m);
… …
1777 int x, y, i; 1680 int x, y, i;
1778 long monster_cnt = 0; 1681 long monster_cnt = 0;
1779 double avgexp = 0; 1682 double avgexp = 0;
1780 sint64 total_exp = 0; 1683 sint64 total_exp = 0;
1781 1684
1782 if (MAP_DIFFICULTY (m)) 1685 if (m->difficulty)
1783 { 1686 {
1784 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1687 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1785 return MAP_DIFFICULTY (m); 1688 return m->difficulty;
1786 } 1689 }
1787 1690
1788 for (x = 0; x < MAP_WIDTH (m); x++) 1691 for (x = 0; x < m->width; x++)
1789 for (y = 0; y < MAP_HEIGHT (m); y++) 1692 for (y = 0; y < m->height; y++)
1790 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 1693 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1791 { 1694 {
1792 if (QUERY_FLAG (op, FLAG_MONSTER)) 1695 if (QUERY_FLAG (op, FLAG_MONSTER))
1793 { 1696 {
1794 total_exp += op->stats.exp; 1697 total_exp += op->stats.exp;
1795 monster_cnt++; 1698 monster_cnt++;
… …
1888 /* All clients need to get re-updated for the change */ 1791 /* All clients need to get re-updated for the change */
1889 update_all_map_los (m); 1792 update_all_map_los (m);
1890 return 1; 1793 return 1;
1891} 1794}
1892 1795
1893
1894/* 1796/*
1895 * This function updates various attributes about a specific space 1797 * This function updates various attributes about a specific space
1896 * on the map (what it looks like, whether it blocks magic, 1798 * on the map (what it looks like, whether it blocks magic,
1897 * has a living creatures, prevents people from passing 1799 * has a living creatures, prevents people from passing
1898 * through, etc) 1800 * through, etc)
1899 */ 1801 */
1900void 1802void
1901update_position (maptile *m, int x, int y) 1803mapspace::update_ ()
1902{ 1804{
1903 object *tmp, *last = NULL; 1805 object *tmp, *last = 0;
1904 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1806 uint8 flags = 0, light = 0, anywhere = 0;
1905 New_Face *top, *floor, *middle; 1807 New_Face *top, *floor, *middle;
1906 object *top_obj, *floor_obj, *middle_obj; 1808 object *top_obj, *floor_obj, *middle_obj;
1907 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1809 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1908 1810
1909 oldflags = GET_MAP_FLAGS (m, x, y);
1910 if (!(oldflags & P_NEED_UPDATE))
1911 {
1912 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1913 return;
1914 }
1915
1916 middle = blank_face; 1811 middle = blank_face;
1917 top = blank_face; 1812 top = blank_face;
1918 floor = blank_face; 1813 floor = blank_face;
1919 1814
1920 middle_obj = NULL; 1815 middle_obj = 0;
1921 top_obj = NULL; 1816 top_obj = 0;
1922 floor_obj = NULL; 1817 floor_obj = 0;
1923 1818
1924 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1819 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1925 { 1820 {
1926
1927 /* This could be made additive I guess (two lights better than 1821 /* This could be made additive I guess (two lights better than
1928 * one). But if so, it shouldn't be a simple additive - 2 1822 * one). But if so, it shouldn't be a simple additive - 2
1929 * light bulbs do not illuminate twice as far as once since 1823 * light bulbs do not illuminate twice as far as once since
1930 * it is a disapation factor that is squared (or is it cubed?) 1824 * it is a dissapation factor that is cubed.
1931 */ 1825 */
1932 if (tmp->glow_radius > light) 1826 if (tmp->glow_radius > light)
1933 light = tmp->glow_radius; 1827 light = tmp->glow_radius;
1934 1828
1935 /* This call is needed in order to update objects the player 1829 /* This call is needed in order to update objects the player
… …
1973 { 1867 {
1974 middle = tmp->face; 1868 middle = tmp->face;
1975 middle_obj = tmp; 1869 middle_obj = tmp;
1976 } 1870 }
1977 } 1871 }
1872
1978 if (tmp == tmp->above) 1873 if (tmp == tmp->above)
1979 { 1874 {
1980 LOG (llevError, "Error in structure of map\n"); 1875 LOG (llevError, "Error in structure of map\n");
1981 exit (-1); 1876 exit (-1);
1982 } 1877 }
1983 1878
1984 move_slow |= tmp->move_slow; 1879 move_slow |= tmp->move_slow;
1985 move_block |= tmp->move_block; 1880 move_block |= tmp->move_block;
1986 move_on |= tmp->move_on; 1881 move_on |= tmp->move_on;
1987 move_off |= tmp->move_off; 1882 move_off |= tmp->move_off;
1988 move_allow |= tmp->move_allow; 1883 move_allow |= tmp->move_allow;
1989 1884
1990 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1991 flags |= P_IS_ALIVE;
1992 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
1993 flags |= P_NO_MAGIC;
1994 if (QUERY_FLAG (tmp, FLAG_DAMNED))
1995 flags |= P_NO_CLERIC;
1996 if (tmp->type == SAFE_GROUND)
1997 flags |= P_SAFE;
1998
1999 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1885 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2000 flags |= P_BLOCKSVIEW; 1886 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2001 } /* for stack of objects */ 1887 if (tmp->type == PLAYER) flags |= P_PLAYER;
2002 1888 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2003 /* we don't want to rely on this function to have accurate flags, but 1889 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
2004 * since we're already doing the work, we calculate them here. 1890 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
2005 * if they don't match, logic is broken someplace.
2006 */
2007 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2008 { 1891 }
2009 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1892
2010 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1893 this->light = light;
2011 } 1894 this->flags_ = flags;
2012 SET_MAP_FLAGS (m, x, y, flags); 1895 this->move_block = move_block & ~move_allow;
2013 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1896 this->move_on = move_on;
2014 SET_MAP_MOVE_ON (m, x, y, move_on); 1897 this->move_off = move_off;
2015 SET_MAP_MOVE_OFF (m, x, y, move_off); 1898 this->move_slow = move_slow;
2016 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2017 1899
2018 /* At this point, we have a floor face (if there is a floor), 1900 /* At this point, we have a floor face (if there is a floor),
2019 * and the floor is set - we are not going to touch it at 1901 * and the floor is set - we are not going to touch it at
2020 * this point. 1902 * this point.
2021 * middle contains the highest visibility face. 1903 * middle contains the highest visibility face.
… …
2075 break; 1957 break;
2076 } 1958 }
2077 } 1959 }
2078 } 1960 }
2079 } 1961 }
1962
2080 if (middle == floor) 1963 if (middle == floor)
2081 middle = blank_face; 1964 middle = blank_face;
1965
2082 if (top == middle) 1966 if (top == middle)
2083 middle = blank_face; 1967 middle = blank_face;
2084 SET_MAP_FACE (m, x, y, top, 0);
2085 if (top != blank_face)
2086 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2087 else
2088 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2089 SET_MAP_FACE (m, x, y, middle, 1);
2090 if (middle != blank_face)
2091 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2092 else
2093 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2094 SET_MAP_FACE (m, x, y, floor, 2);
2095 if (floor != blank_face)
2096 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2097 else
2098 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2099 SET_MAP_LIGHT (m, x, y, light);
2100}
2101 1968
1969 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1970 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1971 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1972}
2102 1973
2103void 1974void
2104set_map_reset_time (maptile *map) 1975set_map_reset_time (maptile *map)
2105{ 1976{
2106 int timeout; 1977 int timeout;
2107 1978
2108 timeout = MAP_RESET_TIMEOUT (map); 1979 timeout = map->reset_timeout;
2109 if (timeout <= 0) 1980 if (timeout <= 0)
2110 timeout = MAP_DEFAULTRESET; 1981 timeout = MAP_DEFAULTRESET;
2111 if (timeout >= MAP_MAXRESET) 1982 if (timeout >= MAP_MAXRESET)
2112 timeout = MAP_MAXRESET; 1983 timeout = MAP_MAXRESET;
2113 MAP_WHEN_RESET (map) = time (0) + timeout; 1984 map->reset_time = time (0) + timeout;
2114} 1985}
2115 1986
2116/* this updates the orig_map->tile_map[tile_num] value after loading 1987/* this updates the orig_map->tile_map[tile_num] value after loading
2117 * the map. It also takes care of linking back the freshly loaded 1988 * the map. It also takes care of linking back the freshly loaded
2118 * maps tile_map values if it tiles back to this one. It returns 1989 * maps tile_map values if it tiles back to this one. It returns
… …
2146 * 2017 *
2147 */ 2018 */
2148int 2019int
2149out_of_map (maptile *m, int x, int y) 2020out_of_map (maptile *m, int x, int y)
2150{ 2021{
2151
2152 /* If we get passed a null map, this is obviously the 2022 /* If we get passed a null map, this is obviously the
2153 * case. This generally shouldn't happen, but if the 2023 * case. This generally shouldn't happen, but if the
2154 * map loads fail below, it could happen. 2024 * map loads fail below, it could happen.
2155 */ 2025 */
2156 if (!m) 2026 if (!m)
… …
2158 2028
2159 if (x < 0) 2029 if (x < 0)
2160 { 2030 {
2161 if (!m->tile_path[3]) 2031 if (!m->tile_path[3])
2162 return 1; 2032 return 1;
2033
2163 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2034 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2164 {
2165 load_and_link_tiled_map (m, 3); 2035 load_and_link_tiled_map (m, 3);
2166 } 2036
2167 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2037 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2168 } 2038 }
2169 if (x >= MAP_WIDTH (m)) 2039
2040 if (x >= m->width)
2170 { 2041 {
2171 if (!m->tile_path[1]) 2042 if (!m->tile_path[1])
2172 return 1; 2043 return 1;
2044
2173 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2045 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2174 {
2175 load_and_link_tiled_map (m, 1); 2046 load_and_link_tiled_map (m, 1);
2176 } 2047
2177 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2048 return (out_of_map (m->tile_map[1], x - m->width, y));
2178 } 2049 }
2050
2179 if (y < 0) 2051 if (y < 0)
2180 { 2052 {
2181 if (!m->tile_path[0]) 2053 if (!m->tile_path[0])
2182 return 1; 2054 return 1;
2055
2183 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2056 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2184 {
2185 load_and_link_tiled_map (m, 0); 2057 load_and_link_tiled_map (m, 0);
2186 } 2058
2187 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2059 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2188 } 2060 }
2189 if (y >= MAP_HEIGHT (m)) 2061
2062 if (y >= m->height)
2190 { 2063 {
2191 if (!m->tile_path[2]) 2064 if (!m->tile_path[2])
2192 return 1; 2065 return 1;
2066
2193 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2067 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2194 {
2195 load_and_link_tiled_map (m, 2); 2068 load_and_link_tiled_map (m, 2);
2196 } 2069
2197 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2070 return (out_of_map (m->tile_map[2], x, y - m->height));
2198 } 2071 }
2199 2072
2200 /* Simple case - coordinates are within this local 2073 /* Simple case - coordinates are within this local
2201 * map. 2074 * map.
2202 */ 2075 */
… …
2216{ 2089{
2217 2090
2218 if (*x < 0) 2091 if (*x < 0)
2219 { 2092 {
2220 if (!m->tile_path[3]) 2093 if (!m->tile_path[3])
2221 return NULL; 2094 return 0;
2222 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2095 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2223 load_and_link_tiled_map (m, 3); 2096 load_and_link_tiled_map (m, 3);
2224 2097
2225 *x += MAP_WIDTH (m->tile_map[3]); 2098 *x += m->tile_map[3]->width;
2226 return (get_map_from_coord (m->tile_map[3], x, y)); 2099 return (get_map_from_coord (m->tile_map[3], x, y));
2227 } 2100 }
2228 if (*x >= MAP_WIDTH (m)) 2101
2102 if (*x >= m->width)
2229 { 2103 {
2230 if (!m->tile_path[1]) 2104 if (!m->tile_path[1])
2231 return NULL; 2105 return 0;
2106
2232 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2107 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2233 load_and_link_tiled_map (m, 1); 2108 load_and_link_tiled_map (m, 1);
2234 2109
2235 *x -= MAP_WIDTH (m); 2110 *x -= m->width;
2236 return (get_map_from_coord (m->tile_map[1], x, y)); 2111 return (get_map_from_coord (m->tile_map[1], x, y));
2237 } 2112 }
2113
2238 if (*y < 0) 2114 if (*y < 0)
2239 { 2115 {
2240 if (!m->tile_path[0]) 2116 if (!m->tile_path[0])
2241 return NULL; 2117 return 0;
2118
2242 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2119 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2243 load_and_link_tiled_map (m, 0); 2120 load_and_link_tiled_map (m, 0);
2244 2121
2245 *y += MAP_HEIGHT (m->tile_map[0]); 2122 *y += m->tile_map[0]->height;
2246 return (get_map_from_coord (m->tile_map[0], x, y)); 2123 return (get_map_from_coord (m->tile_map[0], x, y));
2247 } 2124 }
2248 if (*y >= MAP_HEIGHT (m)) 2125
2126 if (*y >= m->height)
2249 { 2127 {
2250 if (!m->tile_path[2]) 2128 if (!m->tile_path[2])
2251 return NULL; 2129 return 0;
2130
2252 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2131 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2253 load_and_link_tiled_map (m, 2); 2132 load_and_link_tiled_map (m, 2);
2254 2133
2255 *y -= MAP_HEIGHT (m); 2134 *y -= m->height;
2256 return (get_map_from_coord (m->tile_map[2], x, y)); 2135 return (get_map_from_coord (m->tile_map[2], x, y));
2257 } 2136 }
2258 2137
2259 /* Simple case - coordinates are within this local 2138 /* Simple case - coordinates are within this local
2260 * map. 2139 * map.
… …
2280 2159
2281 } 2160 }
2282 else if (map1->tile_map[0] == map2) 2161 else if (map1->tile_map[0] == map2)
2283 { /* up */ 2162 { /* up */
2284 *dx = 0; 2163 *dx = 0;
2285 *dy = -MAP_HEIGHT (map2); 2164 *dy = -map2->height;
2286 } 2165 }
2287 else if (map1->tile_map[1] == map2) 2166 else if (map1->tile_map[1] == map2)
2288 { /* right */ 2167 { /* right */
2289 *dx = MAP_WIDTH (map1); 2168 *dx = map1->width;
2290 *dy = 0; 2169 *dy = 0;
2291 } 2170 }
2292 else if (map1->tile_map[2] == map2) 2171 else if (map1->tile_map[2] == map2)
2293 { /* down */ 2172 { /* down */
2294 *dx = 0; 2173 *dx = 0;
2295 *dy = MAP_HEIGHT (map1); 2174 *dy = map1->height;
2296 } 2175 }
2297 else if (map1->tile_map[3] == map2) 2176 else if (map1->tile_map[3] == map2)
2298 { /* left */ 2177 { /* left */
2299 *dx = -MAP_WIDTH (map2); 2178 *dx = -map2->width;
2300 *dy = 0; 2179 *dy = 0;
2301 2180
2302 } 2181 }
2303 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 2182 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2304 { /* up right */ 2183 { /* up right */
2305 *dx = MAP_WIDTH (map1->tile_map[0]); 2184 *dx = map1->tile_map[0]->width;
2306 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2185 *dy = -map1->tile_map[0]->height;
2307 } 2186 }
2308 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 2187 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2309 { /* up left */ 2188 { /* up left */
2310 *dx = -MAP_WIDTH (map2); 2189 *dx = -map2->width;
2311 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2190 *dy = -map1->tile_map[0]->height;
2312 } 2191 }
2313 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 2192 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2314 { /* right up */ 2193 { /* right up */
2315 *dx = MAP_WIDTH (map1); 2194 *dx = map1->width;
2316 *dy = -MAP_HEIGHT (map2); 2195 *dy = -map2->height;
2317 } 2196 }
2318 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 2197 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2319 { /* right down */ 2198 { /* right down */
2320 *dx = MAP_WIDTH (map1); 2199 *dx = map1->width;
2321 *dy = MAP_HEIGHT (map1->tile_map[1]); 2200 *dy = map1->tile_map[1]->height;
2322 } 2201 }
2323 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 2202 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2324 { /* down right */ 2203 { /* down right */
2325 *dx = MAP_WIDTH (map1->tile_map[2]); 2204 *dx = map1->tile_map[2]->width;
2326 *dy = MAP_HEIGHT (map1); 2205 *dy = map1->height;
2327 } 2206 }
2328 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 2207 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2329 { /* down left */ 2208 { /* down left */
2330 *dx = -MAP_WIDTH (map2); 2209 *dx = -map2->width;
2331 *dy = MAP_HEIGHT (map1); 2210 *dy = map1->height;
2332 } 2211 }
2333 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 2212 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2334 { /* left up */ 2213 { /* left up */
2335 *dx = -MAP_WIDTH (map1->tile_map[3]); 2214 *dx = -map1->tile_map[3]->width;
2336 *dy = -MAP_HEIGHT (map2); 2215 *dy = -map2->height;
2337 } 2216 }
2338 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 2217 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2339 { /* left down */ 2218 { /* left down */
2340 *dx = -MAP_WIDTH (map1->tile_map[3]); 2219 *dx = -map1->tile_map[3]->width;
2341 *dy = MAP_HEIGHT (map1->tile_map[3]); 2220 *dy = map1->tile_map[3]->height;
2342 2221
2343 } 2222 }
2344 else 2223 else
2345 { /* not "adjacent" enough */ 2224 { /* not "adjacent" enough */
2346 return 0; 2225 return 0;

Diff Legend

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