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.46 by root, Wed Dec 20 11:36:38 2006 UTC

… …
27 27
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
33 32
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 */
… …
223void 222void
224dump_all_maps (void) 223dump_all_maps (void)
225{ 224{
226 maptile *m; 225 maptile *m;
227 226
228 for (m = first_map; m != NULL; m = m->next) 227 for (m = first_map; m; m = m->next)
229 {
230 dump_map (m); 228 dump_map (m);
231 }
232} 229}
233 230
234/* This rolls up wall, blocks_magic, blocks_view, etc, all into 231/* This rolls up wall, blocks_magic, blocks_view, etc, all into
235 * one function that just returns a P_.. value (see map.h) 232 * one function that just returns a P_.. value (see map.h)
236 * it will also do map translation for tiled maps, returning 233 * it will also do map translation for tiled maps, returning
… …
240 * is needed. The case of not passing values is if we're just 237 * is needed. The case of not passing values is if we're just
241 * checking for the existence of something on those spaces, but 238 * checking for the existence of something on those spaces, but
242 * don't expect to insert/remove anything from those spaces. 239 * don't expect to insert/remove anything from those spaces.
243 */ 240 */
244int 241int
245get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) 242get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
246{ 243{
247 sint16 newx, newy; 244 sint16 newx, newy;
248 int retval = 0; 245 int retval = 0;
249 maptile *mp; 246 maptile *mp;
250 247
251 if (out_of_map (oldmap, x, y))
252 return P_OUT_OF_MAP;
253 newx = x; 248 newx = x;
254 newy = y; 249 newy = y;
250
255 mp = get_map_from_coord (oldmap, &newx, &newy); 251 mp = get_map_from_coord (oldmap, &newx, &newy);
252
253 if (!mp)
254 return P_OUT_OF_MAP;
255
256 if (mp != oldmap) 256 if (mp != oldmap)
257 retval |= P_NEW_MAP; 257 retval |= P_NEW_MAP;
258 if (newmap)
259 *newmap = mp;
260 if (nx)
261 *nx = newx;
262 if (ny)
263 *ny = newy;
264 258
265 retval |= mp->spaces[newx + mp->width * newy].flags; 259 if (newmap) *newmap = mp;
260 if (nx) *nx = newx;
261 if (ny) *ny = newy;
266 262
267 return retval; 263 return retval | mp->at (newx, newy).flags ();
268} 264}
269 265
270/* 266/*
271 * Returns true if the given coordinate is blocked except by the 267 * Returns true if the given coordinate is blocked except by the
272 * object passed is not blocking. This is used with 268 * object passed is not blocking. This is used with
… …
295 } 291 }
296 292
297 /* Save some cycles - instead of calling get_map_flags(), just get the value 293 /* Save some cycles - instead of calling get_map_flags(), just get the value
298 * directly. 294 * directly.
299 */ 295 */
300 mflags = m->spaces[sx + m->width * sy].flags; 296 mflags = m->at (sx, sy).flags ();
301 297
302 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 298 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
303 299
304 /* If space is currently not blocked by anything, no need to 300 /* If space is currently not blocked by anything, no need to
305 * go further. Not true for players - all sorts of special 301 * go further. Not true for players - all sorts of special
… …
324 /* We basically go through the stack of objects, and if there is 320 /* We basically go through the stack of objects, and if there is
325 * some other object that has NO_PASS or FLAG_ALIVE set, return 321 * some other object that has NO_PASS or FLAG_ALIVE set, return
326 * true. If we get through the entire stack, that must mean 322 * true. If we get through the entire stack, that must mean
327 * ob is blocking it, so return 0. 323 * ob is blocking it, so return 0.
328 */ 324 */
329 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) 325 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
330 { 326 {
331 327
332 /* This must be before the checks below. Code for inventory checkers. */ 328 /* This must be before the checks below. Code for inventory checkers. */
333 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 329 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
334 { 330 {
… …
398 * 394 *
399 * Note this used to be arch_blocked, but with new movement 395 * Note this used to be arch_blocked, but with new movement
400 * code, we need to have actual object to check its move_type 396 * code, we need to have actual object to check its move_type
401 * against the move_block values. 397 * against the move_block values.
402 */ 398 */
403
404int 399int
405ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 400ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
406{ 401{
407 archetype *tmp; 402 archetype *tmp;
408 int flag; 403 int flag;
… …
438 433
439 /* Note it is intentional that we check ob - the movement type of the 434 /* Note it is intentional that we check ob - the movement type of the
440 * head of the object should correspond for the entire object. 435 * head of the object should correspond for the entire object.
441 */ 436 */
442 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 437 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy)))
443 return AB_NO_PASS; 438 return P_NO_PASS;
444
445 } 439 }
440
446 return 0; 441 return 0;
447} 442}
448 443
449/* When the map is loaded, load_object does not actually insert objects 444/* 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 445 * into inventory, but just links them. What this does is go through
… …
487 object *tmp, *op, *last, *above; 482 object *tmp, *op, *last, *above;
488 archetype *at; 483 archetype *at;
489 484
490 for (x = 0; x < MAP_WIDTH (m); x++) 485 for (x = 0; x < MAP_WIDTH (m); x++)
491 for (y = 0; y < MAP_HEIGHT (m); y++) 486 for (y = 0; y < MAP_HEIGHT (m); y++)
492 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) 487 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
493 { 488 {
494 above = tmp->above; 489 above = tmp->above;
495 490
496 /* already multipart - don't do anything more */ 491 /* already multipart - don't do anything more */
497 if (tmp->head || tmp->more) 492 if (tmp->head || tmp->more)
… …
582 { 577 {
583 for (j = 0; j < m->height; j++) 578 for (j = 0; j < m->height; j++)
584 { 579 {
585 unique = 0; 580 unique = 0;
586 /* check for unique items, or unique squares */ 581 /* check for unique items, or unique squares */
587 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 582 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
588 { 583 {
589 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 584 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
590 unique = 1; 585 unique = 1;
591 586
592 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 587 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
… …
613 /* first pass - save one-part objects */ 608 /* first pass - save one-part objects */
614 for (i = 0; i < MAP_WIDTH (m); i++) 609 for (i = 0; i < MAP_WIDTH (m); i++)
615 for (j = 0; j < MAP_HEIGHT (m); j++) 610 for (j = 0; j < MAP_HEIGHT (m); j++)
616 { 611 {
617 unique = 0; 612 unique = 0;
618 for (op = get_map_ob (m, i, j); op; op = op->above) 613 for (op = GET_MAP_OB (m, i, j); op; op = op->above)
619 { 614 {
620 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 615 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
621 unique = 1; 616 unique = 1;
622 617
623 if (op->type == PLAYER) 618 if (op->type == PLAYER)
624 {
625 LOG (llevDebug, "Player on map that is being saved\n");
626 continue; 619 continue;
627 }
628 620
629 if (op->head || op->owner) 621 if (op->head || op->owner)
630 continue; 622 continue;
631 623
632 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 624 if (unique || QUERY_FLAG (op, FLAG_UNIQUE))
633 save_object (fp2, op, 3); 625 save_object (fp2, op, 3);
634 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 626 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID))))
635 save_object (fp, op, 3); 627 save_object (fp, op, 3);
636 628 }
637 } /* for this space */ 629 }
638 } /* for this j */
639} 630}
640 631
641maptile::maptile () 632maptile::maptile ()
642{ 633{
643 in_memory = MAP_SWAPPED; 634 in_memory = MAP_SWAPPED;
… …
693 { 684 {
694 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); 685 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
695 free (spaces); 686 free (spaces);
696 } 687 }
697 688
698 spaces = (MapSpace *) 689 spaces = (mapspace *)
699 calloc (1, width * height * sizeof (MapSpace)); 690 calloc (1, width * height * sizeof (mapspace));
700 691
701 if (!spaces) 692 if (!spaces)
702 fatal (OUT_OF_MEMORY); 693 fatal (OUT_OF_MEMORY);
703} 694}
704 695
… …
730 char *shop_string, *p, *q, *next_semicolon, *next_colon; 721 char *shop_string, *p, *q, *next_semicolon, *next_colon;
731 shopitems *items = NULL; 722 shopitems *items = NULL;
732 int i = 0, number_of_entries = 0; 723 int i = 0, number_of_entries = 0;
733 const typedata *current_type; 724 const typedata *current_type;
734 725
735 shop_string = strdup_local (input_string); 726 shop_string = strdup (input_string);
736 p = shop_string; 727 p = shop_string;
737 /* first we'll count the entries, we'll need that for allocating the array shortly */ 728 /* first we'll count the entries, we'll need that for allocating the array shortly */
738 while (p) 729 while (p)
739 { 730 {
740 p = strchr (p, ';'); 731 p = strchr (p, ';');
… …
926 * with nothing between). There is no reason in those cases to 917 * with nothing between). There is no reason in those cases to
927 * keep the empty message. Also, msgbuf contains garbage data 918 * keep the empty message. Also, msgbuf contains garbage data
928 * when msgpos is zero, so copying it results in crashes 919 * when msgpos is zero, so copying it results in crashes
929 */ 920 */
930 if (msgpos != 0) 921 if (msgpos != 0)
931 m->msg = strdup_local (msgbuf); 922 m->msg = strdup (msgbuf);
932 } 923 }
933 else if (!strcmp (key, "maplore")) 924 else if (!strcmp (key, "maplore"))
934 { 925 {
935 while (fgets (buf, HUGE_BUF, fp) != NULL) 926 while (fgets (buf, HUGE_BUF, fp) != NULL)
936 { 927 {
… …
942 strcpy (maplorebuf + maplorepos, buf); 933 strcpy (maplorebuf + maplorepos, buf);
943 maplorepos += strlen (buf); 934 maplorepos += strlen (buf);
944 } 935 }
945 } 936 }
946 if (maplorepos != 0) 937 if (maplorepos != 0)
947 m->maplore = strdup_local (maplorebuf); 938 m->maplore = strdup (maplorebuf);
948 } 939 }
949 else if (!strcmp (key, "end")) 940 else if (!strcmp (key, "end"))
950 { 941 {
951 break; 942 break;
952 } 943 }
… …
961 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); 952 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
962 } 953 }
963 else if (!strcmp (key, "name")) 954 else if (!strcmp (key, "name"))
964 { 955 {
965 *end = 0; 956 *end = 0;
966 m->name = strdup_local (value); 957 m->name = strdup (value);
967 } 958 }
968 /* first strcmp value on these are old names supported 959 /* first strcmp value on these are old names supported
969 * for compatibility reasons. The new values (second) are 960 * for compatibility reasons. The new values (second) are
970 * what really should be used. 961 * what really should be used.
971 */ 962 */
… …
1009 else if (!strcmp (key, "shopmax")) 1000 else if (!strcmp (key, "shopmax"))
1010 m->shopmax = atol (value); 1001 m->shopmax = atol (value);
1011 else if (!strcmp (key, "shoprace")) 1002 else if (!strcmp (key, "shoprace"))
1012 { 1003 {
1013 *end = 0; 1004 *end = 0;
1014 m->shoprace = strdup_local (value); 1005 m->shoprace = strdup (value);
1015 } 1006 }
1016 else if (!strcmp (key, "outdoor")) 1007 else if (!strcmp (key, "outdoor"))
1017 m->outdoor = atoi (value); 1008 m->outdoor = atoi (value);
1018 else if (!strcmp (key, "temp")) 1009 else if (!strcmp (key, "temp"))
1019 m->temp = atoi (value); 1010 m->temp = atoi (value);
… …
1069 } 1060 }
1070 1061
1071 if (editor) 1062 if (editor)
1072 { 1063 {
1073 /* Use the value as in the file. */ 1064 /* Use the value as in the file. */
1074 m->tile_path[tile - 1] = strdup_local (value); 1065 m->tile_path[tile - 1] = strdup (value);
1075 } 1066 }
1076 else if (path != NULL) 1067 else if (path != NULL)
1077 { 1068 {
1078 /* Use the normalized value. */ 1069 /* Use the normalized value. */
1079 m->tile_path[tile - 1] = strdup_local (path); 1070 m->tile_path[tile - 1] = strdup (path);
1080 } 1071 }
1081 } /* end if tile direction (in)valid */ 1072 } /* end if tile direction (in)valid */
1082 } 1073 }
1083 else 1074 else
1084 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); 1075 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
… …
1250 for (i = 0; i < MAP_WIDTH (m); i++) 1241 for (i = 0; i < MAP_WIDTH (m); i++)
1251 for (j = 0; j < MAP_HEIGHT (m); j++) 1242 for (j = 0; j < MAP_HEIGHT (m); j++)
1252 { 1243 {
1253 unique = 0; 1244 unique = 0;
1254 1245
1255 for (op = get_map_ob (m, i, j); op; op = next) 1246 for (op = GET_MAP_OB (m, i, j); op; op = next)
1256 { 1247 {
1257 next = op->above; 1248 next = op->above;
1258 1249
1259 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1250 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1260 unique = 1; 1251 unique = 1;
… …
1343 make_path_to_file (filename); 1334 make_path_to_file (filename);
1344 } 1335 }
1345 else 1336 else
1346 { 1337 {
1347 if (!m->tmpname) 1338 if (!m->tmpname)
1348 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1339 m->tmpname = tempnam (settings.tmpdir, NULL);
1349 1340
1350 strcpy (filename, m->tmpname); 1341 strcpy (filename, m->tmpname);
1351 } 1342 }
1352 1343
1353 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1344 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1639 last->next = m->next; 1630 last->next = m->next;
1640 1631
1641 delete m; 1632 delete m;
1642} 1633}
1643 1634
1644
1645
1646/* 1635/*
1647 * Makes sure the given map is loaded and swapped in. 1636 * Makes sure the given map is loaded and swapped in.
1648 * name is path name of the map. 1637 * name is path name of the map.
1649 * flags meaning: 1638 * flags meaning:
1650 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory, 1639 * 0x1 (MAP_FLUSH): flush the map - always load from the map directory,
… …
1652 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. 1641 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1653 * dont do any more name translation on it. 1642 * dont do any more name translation on it.
1654 * 1643 *
1655 * Returns a pointer to the given map. 1644 * Returns a pointer to the given map.
1656 */ 1645 */
1657
1658maptile * 1646maptile *
1659ready_map_name (const char *name, int flags) 1647ready_map_name (const char *name, int flags)
1660{ 1648{
1661 maptile *m; 1649 maptile *m;
1662 1650
… …
1785 return MAP_DIFFICULTY (m); 1773 return MAP_DIFFICULTY (m);
1786 } 1774 }
1787 1775
1788 for (x = 0; x < MAP_WIDTH (m); x++) 1776 for (x = 0; x < MAP_WIDTH (m); x++)
1789 for (y = 0; y < MAP_HEIGHT (m); y++) 1777 for (y = 0; y < MAP_HEIGHT (m); y++)
1790 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 1778 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1791 { 1779 {
1792 if (QUERY_FLAG (op, FLAG_MONSTER)) 1780 if (QUERY_FLAG (op, FLAG_MONSTER))
1793 { 1781 {
1794 total_exp += op->stats.exp; 1782 total_exp += op->stats.exp;
1795 monster_cnt++; 1783 monster_cnt++;
… …
1888 /* All clients need to get re-updated for the change */ 1876 /* All clients need to get re-updated for the change */
1889 update_all_map_los (m); 1877 update_all_map_los (m);
1890 return 1; 1878 return 1;
1891} 1879}
1892 1880
1893
1894/* 1881/*
1895 * This function updates various attributes about a specific space 1882 * This function updates various attributes about a specific space
1896 * on the map (what it looks like, whether it blocks magic, 1883 * on the map (what it looks like, whether it blocks magic,
1897 * has a living creatures, prevents people from passing 1884 * has a living creatures, prevents people from passing
1898 * through, etc) 1885 * through, etc)
1899 */ 1886 */
1900void 1887void
1901update_position (maptile *m, int x, int y) 1888mapspace::update_ ()
1902{ 1889{
1903 object *tmp, *last = NULL; 1890 object *tmp, *last = 0;
1904 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1891 uint8 flags = 0, light = 0, anywhere = 0;
1905 New_Face *top, *floor, *middle; 1892 New_Face *top, *floor, *middle;
1906 object *top_obj, *floor_obj, *middle_obj; 1893 object *top_obj, *floor_obj, *middle_obj;
1907 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1894 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1908 1895
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; 1896 middle = blank_face;
1917 top = blank_face; 1897 top = blank_face;
1918 floor = blank_face; 1898 floor = blank_face;
1919 1899
1920 middle_obj = NULL; 1900 middle_obj = 0;
1921 top_obj = NULL; 1901 top_obj = 0;
1922 floor_obj = NULL; 1902 floor_obj = 0;
1923 1903
1924 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1904 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above)
1925 { 1905 {
1926
1927 /* This could be made additive I guess (two lights better than 1906 /* This could be made additive I guess (two lights better than
1928 * one). But if so, it shouldn't be a simple additive - 2 1907 * one). But if so, it shouldn't be a simple additive - 2
1929 * light bulbs do not illuminate twice as far as once since 1908 * light bulbs do not illuminate twice as far as once since
1930 * it is a disapation factor that is squared (or is it cubed?) 1909 * it is a dissapation factor that is cubed.
1931 */ 1910 */
1932 if (tmp->glow_radius > light) 1911 if (tmp->glow_radius > light)
1933 light = tmp->glow_radius; 1912 light = tmp->glow_radius;
1934 1913
1935 /* This call is needed in order to update objects the player 1914 /* This call is needed in order to update objects the player
… …
1973 { 1952 {
1974 middle = tmp->face; 1953 middle = tmp->face;
1975 middle_obj = tmp; 1954 middle_obj = tmp;
1976 } 1955 }
1977 } 1956 }
1957
1978 if (tmp == tmp->above) 1958 if (tmp == tmp->above)
1979 { 1959 {
1980 LOG (llevError, "Error in structure of map\n"); 1960 LOG (llevError, "Error in structure of map\n");
1981 exit (-1); 1961 exit (-1);
1982 } 1962 }
1983 1963
1984 move_slow |= tmp->move_slow; 1964 move_slow |= tmp->move_slow;
1985 move_block |= tmp->move_block; 1965 move_block |= tmp->move_block;
1986 move_on |= tmp->move_on; 1966 move_on |= tmp->move_on;
1987 move_off |= tmp->move_off; 1967 move_off |= tmp->move_off;
1988 move_allow |= tmp->move_allow; 1968 move_allow |= tmp->move_allow;
1989 1969
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)) 1970 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2000 flags |= P_BLOCKSVIEW; 1971 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2001 } /* for stack of objects */ 1972 if (tmp->type == PLAYER) flags |= P_PLAYER;
2002 1973 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2003 /* we don't want to rely on this function to have accurate flags, but 1974 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
2004 * since we're already doing the work, we calculate them here. 1975 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 { 1976 }
2009 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1977
2010 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1978 this->light = light;
2011 } 1979 this->flags_ = flags;
2012 SET_MAP_FLAGS (m, x, y, flags); 1980 this->move_block = move_block & ~move_allow;
2013 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1981 this->move_on = move_on;
2014 SET_MAP_MOVE_ON (m, x, y, move_on); 1982 this->move_off = move_off;
2015 SET_MAP_MOVE_OFF (m, x, y, move_off); 1983 this->move_slow = move_slow;
2016 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2017 1984
2018 /* At this point, we have a floor face (if there is a floor), 1985 /* 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 1986 * and the floor is set - we are not going to touch it at
2020 * this point. 1987 * this point.
2021 * middle contains the highest visibility face. 1988 * middle contains the highest visibility face.
… …
2075 break; 2042 break;
2076 } 2043 }
2077 } 2044 }
2078 } 2045 }
2079 } 2046 }
2047
2080 if (middle == floor) 2048 if (middle == floor)
2081 middle = blank_face; 2049 middle = blank_face;
2050
2082 if (top == middle) 2051 if (top == middle)
2083 middle = blank_face; 2052 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 2053
2054 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
2055 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
2056 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
2057}
2102 2058
2103void 2059void
2104set_map_reset_time (maptile *map) 2060set_map_reset_time (maptile *map)
2105{ 2061{
2106 int timeout; 2062 int timeout;
… …
2146 * 2102 *
2147 */ 2103 */
2148int 2104int
2149out_of_map (maptile *m, int x, int y) 2105out_of_map (maptile *m, int x, int y)
2150{ 2106{
2151
2152 /* If we get passed a null map, this is obviously the 2107 /* If we get passed a null map, this is obviously the
2153 * case. This generally shouldn't happen, but if the 2108 * case. This generally shouldn't happen, but if the
2154 * map loads fail below, it could happen. 2109 * map loads fail below, it could happen.
2155 */ 2110 */
2156 if (!m) 2111 if (!m)
… …
2158 2113
2159 if (x < 0) 2114 if (x < 0)
2160 { 2115 {
2161 if (!m->tile_path[3]) 2116 if (!m->tile_path[3])
2162 return 1; 2117 return 1;
2118
2163 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2119 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2164 {
2165 load_and_link_tiled_map (m, 3); 2120 load_and_link_tiled_map (m, 3);
2166 } 2121
2167 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2122 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y));
2168 } 2123 }
2124
2169 if (x >= MAP_WIDTH (m)) 2125 if (x >= MAP_WIDTH (m))
2170 { 2126 {
2171 if (!m->tile_path[1]) 2127 if (!m->tile_path[1])
2172 return 1; 2128 return 1;
2129
2173 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2130 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2174 {
2175 load_and_link_tiled_map (m, 1); 2131 load_and_link_tiled_map (m, 1);
2176 } 2132
2177 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2133 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y));
2178 } 2134 }
2135
2179 if (y < 0) 2136 if (y < 0)
2180 { 2137 {
2181 if (!m->tile_path[0]) 2138 if (!m->tile_path[0])
2182 return 1; 2139 return 1;
2140
2183 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2141 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2184 {
2185 load_and_link_tiled_map (m, 0); 2142 load_and_link_tiled_map (m, 0);
2186 } 2143
2187 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2144 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0])));
2188 } 2145 }
2146
2189 if (y >= MAP_HEIGHT (m)) 2147 if (y >= MAP_HEIGHT (m))
2190 { 2148 {
2191 if (!m->tile_path[2]) 2149 if (!m->tile_path[2])
2192 return 1; 2150 return 1;
2151
2193 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2152 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2194 {
2195 load_and_link_tiled_map (m, 2); 2153 load_and_link_tiled_map (m, 2);
2196 } 2154
2197 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2155 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m)));
2198 } 2156 }
2199 2157
2200 /* Simple case - coordinates are within this local 2158 /* Simple case - coordinates are within this local
2201 * map. 2159 * map.
… …
2216{ 2174{
2217 2175
2218 if (*x < 0) 2176 if (*x < 0)
2219 { 2177 {
2220 if (!m->tile_path[3]) 2178 if (!m->tile_path[3])
2221 return NULL; 2179 return 0;
2222 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2180 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2223 load_and_link_tiled_map (m, 3); 2181 load_and_link_tiled_map (m, 3);
2224 2182
2225 *x += MAP_WIDTH (m->tile_map[3]); 2183 *x += MAP_WIDTH (m->tile_map[3]);
2226 return (get_map_from_coord (m->tile_map[3], x, y)); 2184 return (get_map_from_coord (m->tile_map[3], x, y));
2227 } 2185 }
2186
2228 if (*x >= MAP_WIDTH (m)) 2187 if (*x >= MAP_WIDTH (m))
2229 { 2188 {
2230 if (!m->tile_path[1]) 2189 if (!m->tile_path[1])
2231 return NULL; 2190 return 0;
2191
2232 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2192 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2233 load_and_link_tiled_map (m, 1); 2193 load_and_link_tiled_map (m, 1);
2234 2194
2235 *x -= MAP_WIDTH (m); 2195 *x -= MAP_WIDTH (m);
2236 return (get_map_from_coord (m->tile_map[1], x, y)); 2196 return (get_map_from_coord (m->tile_map[1], x, y));
2237 } 2197 }
2198
2238 if (*y < 0) 2199 if (*y < 0)
2239 { 2200 {
2240 if (!m->tile_path[0]) 2201 if (!m->tile_path[0])
2241 return NULL; 2202 return 0;
2203
2242 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2204 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2243 load_and_link_tiled_map (m, 0); 2205 load_and_link_tiled_map (m, 0);
2244 2206
2245 *y += MAP_HEIGHT (m->tile_map[0]); 2207 *y += MAP_HEIGHT (m->tile_map[0]);
2246 return (get_map_from_coord (m->tile_map[0], x, y)); 2208 return (get_map_from_coord (m->tile_map[0], x, y));
2247 } 2209 }
2210
2248 if (*y >= MAP_HEIGHT (m)) 2211 if (*y >= MAP_HEIGHT (m))
2249 { 2212 {
2250 if (!m->tile_path[2]) 2213 if (!m->tile_path[2])
2251 return NULL; 2214 return 0;
2215
2252 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2216 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2253 load_and_link_tiled_map (m, 2); 2217 load_and_link_tiled_map (m, 2);
2254 2218
2255 *y -= MAP_HEIGHT (m); 2219 *y -= MAP_HEIGHT (m);
2256 return (get_map_from_coord (m->tile_map[2], x, y)); 2220 return (get_map_from_coord (m->tile_map[2], x, y));

Diff Legend

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